From 2a57b7742580c13fceb8b512a7df783616754060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Fri, 15 Jul 2022 13:59:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9rpj=5Faudit=5Fend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ai/main.py | 4 +++- apps/ecm/demo.py | 1 + apps/hrm/models.py | 3 +++ apps/rpm/services.py | 2 +- apps/wf/views.py | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/ai/main.py b/apps/ai/main.py index 1a650bc6..d8e80acf 100644 --- a/apps/ai/main.py +++ b/apps/ai/main.py @@ -1,2 +1,4 @@ class AiService: - pass + algo_dict = { + "helmet": "apps.helmet.algo.helmet" + } diff --git a/apps/ecm/demo.py b/apps/ecm/demo.py index bd63891f..001dd7a5 100644 --- a/apps/ecm/demo.py +++ b/apps/ecm/demo.py @@ -103,3 +103,4 @@ params_dict = {"id": "xxxxx001", "DevChannel": "1000038$1$0$1", "SnapType": 1, "CmdSrc": 0}} +params_str = "{\"method\":\"dev.snap\",\"id\":123,\"params\":{\"DevID\":\"1000038\",\"DevChannel\":0,\"PicNum\":1,\"SnapType\":1,\"CmdSrc\":0}}" \ No newline at end of file diff --git a/apps/hrm/models.py b/apps/hrm/models.py index 01ee146b..c871515f 100755 --- a/apps/hrm/models.py +++ b/apps/hrm/models.py @@ -49,6 +49,9 @@ class Employee(CommonBModel): def __str__(self): return self.name + def save(self, *args, **kwargs) -> None: + return super().save(*args, **kwargs) + # class Card(CommonAModel): # """ diff --git a/apps/rpm/services.py b/apps/rpm/services.py index eb13991e..542d4c84 100644 --- a/apps/rpm/services.py +++ b/apps/rpm/services.py @@ -41,7 +41,7 @@ def rpj_audit_end(ticket): # 同步至大华人员库并下发人脸 HrmService.sync_dahua_employee(ep, '', rpj.come_time, rpj.leave_time) # 更新入厂项目人员证书库 - for i in Rpjcertificate.objects.filter(rpj=rpj): + for i in Rpjcertificate.objects.filter(rpj_member__rpj=rpj): ct = Certificate.objects.filter(number=i.number).first() if ct: pass diff --git a/apps/wf/views.py b/apps/wf/views.py index fb444eb5..5e8deb37 100755 --- a/apps/wf/views.py +++ b/apps/wf/views.py @@ -442,7 +442,7 @@ class TicketViewSet(CreateUpdateCustomMixin, CreateModelMixin, ListModelMixin, R if not ticket.script_run_last_result: ticket.script_run_last_result = True ticket.save() - run_task.delay(ticket.id) + run_task(ticket.id) return Response()