From ee67e6896a22bfe10a6daab251bac943bcb28252 Mon Sep 17 00:00:00 2001 From: zty Date: Tue, 14 Oct 2025 14:58:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20ofm-service=20=E5=8F=8D=E5=90=91?= =?UTF-8?q?=E5=AD=98=E5=82=A8ticket=5Fdata=20=E5=88=B0=20Lendingseal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ofm/services.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/ofm/services.py b/apps/ofm/services.py index 7e95286c..82925cea 100644 --- a/apps/ofm/services.py +++ b/apps/ofm/services.py @@ -43,6 +43,18 @@ def bind_lendingseal(ticket: Ticket, transition, new_ticket_data: dict): ins.ticket = ticket ins.save() +def lending_save_ticket_data(ticket: Ticket, new_ticket_data: dict, **kwargs): + try: + obj = LendingSeal.objects.get(id=new_ticket_data['t_id']) + except LendingSeal.DoesNotExist: + raise ParseError("Publicity t_id 不存在") + data_save = {k: v for k, v in new_ticket_data.items() if k not in ['t_model', 't_id']} + + for k, v in data_save.items(): + setattr(obj, k, v) + obj.save() + + def bind_vehicle(ticket: Ticket, transition, new_ticket_data: dict): ins = Vehicle.objects.get(id=new_ticket_data['t_id']) ticket_data = ticket.ticket_data @@ -57,12 +69,6 @@ def bind_vehicle(ticket: Ticket, transition, new_ticket_data: dict): ins.ticket = ticket ins.save() - -# def update_vehicle_endkm(ticket: Ticket, transition, new_ticket_data: dict): -# ins = Vehicle.objects.get(id=new_ticket_data['t_id']) -# ins.end_km = new_ticket_data['end_km'] -# ins.save() - def bind_file(ticket: Ticket, transition, new_ticket_data: dict): ins = BorrowRecord.objects.get(id=new_ticket_data['t_id']) ticket_data = ticket.ticket_data @@ -77,7 +83,6 @@ def bind_file(ticket: Ticket, transition, new_ticket_data: dict): ins.ticket = ticket ins.save() - def bind_publicity(ticket: Ticket, transition, new_ticket_data: dict): ins = Publicity.objects.get(id=new_ticket_data['t_id']) ticket_data = ticket.ticket_data @@ -92,7 +97,6 @@ def bind_publicity(ticket: Ticket, transition, new_ticket_data: dict): ins.ticket = ticket ins.save() - def save_ticket_data(ticket: Ticket, new_ticket_data: dict, **kwargs): try: obj = Publicity.objects.get(id=new_ticket_data['t_id']) From 830bf18132d55af61917b54cc3030fe53b4edc5e Mon Sep 17 00:00:00 2001 From: zty Date: Tue, 14 Oct 2025 16:08:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20ofm-service-vehicle=20=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E7=AE=A1=E7=90=86=E5=8F=8D=E5=AD=98=20=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E5=BD=92=E8=BF=98=E9=87=8C=E7=A8=8B=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ofm/services.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/ofm/services.py b/apps/ofm/services.py index 82925cea..c49d8e7f 100644 --- a/apps/ofm/services.py +++ b/apps/ofm/services.py @@ -69,6 +69,17 @@ def bind_vehicle(ticket: Ticket, transition, new_ticket_data: dict): ins.ticket = ticket ins.save() +def vehicle_save_ticket_data(ticket: Ticket, new_ticket_data: dict, **kwargs): + try: + obj = Vehicle.objects.get(id=new_ticket_data['t_id']) + except Vehicle.DoesNotExist: + raise ParseError("Publicity t_id 不存在") + data_save = {k: v for k, v in new_ticket_data.items() if k not in ['t_model', 't_id']} + + for k, v in data_save.items(): + setattr(obj, k, v) + obj.save() + def bind_file(ticket: Ticket, transition, new_ticket_data: dict): ins = BorrowRecord.objects.get(id=new_ticket_data['t_id']) ticket_data = ticket.ticket_data From 8a87ba356eed3f86a005e9958e7104db4c372c71 Mon Sep 17 00:00:00 2001 From: zty Date: Wed, 15 Oct 2025 14:10:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20ofm-BorrowRecord=20-=20=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E5=80=9F=E9=98=85=E5=8F=8D=E5=AD=98ticket-data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ofm/services.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/ofm/services.py b/apps/ofm/services.py index c49d8e7f..45ce61a4 100644 --- a/apps/ofm/services.py +++ b/apps/ofm/services.py @@ -93,6 +93,17 @@ def bind_file(ticket: Ticket, transition, new_ticket_data: dict): if ins.ticket is None: ins.ticket = ticket ins.save() + +def file_save_ticket_data(ticket: Ticket, new_ticket_data: dict, **kwargs): + try: + obj = BorrowRecord.objects.get(id=new_ticket_data['t_id']) + except BorrowRecord.DoesNotExist: + raise ParseError("Publicity t_id 不存在") + data_save = {k: v for k, v in new_ticket_data.items() if k not in ['t_model', 't_id']} + + for k, v in data_save.items(): + setattr(obj, k, v) + obj.save() def bind_publicity(ticket: Ticket, transition, new_ticket_data: dict): ins = Publicity.objects.get(id=new_ticket_data['t_id']) From 99d8144bdf73e8042dd95ffc80cedc609cdd7b23 Mon Sep 17 00:00:00 2001 From: zty Date: Wed, 15 Oct 2025 15:09:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20ofm-views=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ofm/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ofm/views.py b/apps/ofm/views.py index 2a09878f..f59a7876 100644 --- a/apps/ofm/views.py +++ b/apps/ofm/views.py @@ -156,7 +156,7 @@ class FileborrowViewSet(CustomModelViewSet): queryset = BorrowRecord.objects.all() serializer_class = BorrowRecordSerializer filterset_class = BorrowRecordFilter - ordering = ["create_time"] + ordering = ["-create_time"] class PublicityViewSet(CustomModelViewSet):