From 18350679626101da414bdcaf11bbdf190d16982c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 20 Sep 2022 20:09:40 +0800
Subject: [PATCH] =?UTF-8?q?opl=E4=B8=8D=E5=8F=AF=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ecm/service.py     | 4 ++--
 apps/opm/serializers.py | 3 +++
 apps/opm/services.py    | 6 ++----
 apps/rpm/services.py    | 6 ++----
 apps/vm/services.py     | 6 ++----
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/apps/ecm/service.py b/apps/ecm/service.py
index b8de8c89..8465c258 100644
--- a/apps/ecm/service.py
+++ b/apps/ecm/service.py
@@ -220,9 +220,9 @@ def create_remind(event: Event, params: dict):
                                                      })
     # 开始发送通知
     for i in Remind.objects.filter(event=event):
-        if i.notify_setting.sms_enable and i.recipient.employee.phone:
+        if i.notify_setting.sms_enable and i.recipient.phone:
             # 发送短信通知
-            Thread(target=send_sms, args=(i.recipient.employee.phone,
+            Thread(target=send_sms, args=(i.recipient.phone,
                                           1003, params), daemon=True).start()
         if i.notify_setting.wechat_enable:
             pass
diff --git a/apps/opm/serializers.py b/apps/opm/serializers.py
index 4fe0f2ef..09c8b203 100644
--- a/apps/opm/serializers.py
+++ b/apps/opm/serializers.py
@@ -184,6 +184,9 @@ class OplCreateUpdateSerializer(CustomModelSerializer):
         operation = validated_data['operation']
         if operation.state == Operation.OP_DONE:
             raise ParseError('作业已关闭不可创建许可')
+        cate = validated_data['cate']
+        if Opl.objects.filter(operation=operation, cate=cate).exists():
+            raise ParseError('该类许可证已存在,不可重复申请')
         return super().create(validated_data)
 
 
diff --git a/apps/opm/services.py b/apps/opm/services.py
index d9d3611e..80890015 100644
--- a/apps/opm/services.py
+++ b/apps/opm/services.py
@@ -82,11 +82,9 @@ def opl_audit_end(ticket: Ticket):
     # 授予相关工作人员区域进入权限
     # worker_ep_ids = list(OplWorker.objects.filter(opl=opl).values_list('worker__id', flat=True))
     # 发送通知
-    try:
-        phone = opl.create_by.employee.phone
+    phone = opl.create_by.phone
+    if phone:
         send_sms(phone=phone, template_code=1005, template_param={'name': ticket.workflow.name})
-    except Exception:
-        pass
 
 
 def opl_start(ticket: Ticket):
diff --git a/apps/rpm/services.py b/apps/rpm/services.py
index 8e9a0b9d..ade7b8de 100644
--- a/apps/rpm/services.py
+++ b/apps/rpm/services.py
@@ -131,8 +131,6 @@ def rpj_audit_end(ticket):
     rpj.state = Rpj.RPJ_ENTER
     rpj.save()
     # 发送通知?
-    try:
-        phone = rpj.create_by.employee.phone
+    phone = rpj.create_by.phone
+    if phone:
         send_sms(phone=phone, template_code=1004, template_param={'name': '相关方项目'})
-    except Exception:
-        pass
diff --git a/apps/vm/services.py b/apps/vm/services.py
index 5cbc1da8..8ff1f463 100644
--- a/apps/vm/services.py
+++ b/apps/vm/services.py
@@ -60,11 +60,9 @@ def visit_audit_end(ticket):
     visit.state = Visit.V_ENTER
     visit.save()
     # 发送通知?
-    try:
-        phone = visit.create_by.employee.phone
+    phone = visit.create_by.phone
+    if phone:
         send_sms(phone=phone, template_code=1004, template_param={'name': '访客项目'})
-    except Exception:
-        pass
 
 
 def visit_driver_end(visit: Visit):