From 18190d1100bccd7e48d4eba7f5fcd70d5fc6caab Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 2 Dec 2019 21:43:10 +0800
Subject: [PATCH] operation check complete2

---
 safesite/views.py | 81 +++++++++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/safesite/views.py b/safesite/views.py
index d7552513..1c503921 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -4430,50 +4430,49 @@ def apioperation(req):
             x=User.objects.get(userid=i)
             if int(userid)==int(i):#申请人包含作业人直接确认
                 Operzyry.objects.create(oper=obj,operzyry=x,checked=1)
-                if Operzyry.objects.filter(oper=obj,checked=0).exists():
-                    pass
-                else:#工作人员全部确认
-                    obj.zyzt['zyzt'] = '审批中'
-                    obj.zyzt['index'] = 0
-                    index = obj.zyzt['index']
-                    sprs = [] #初始化审批人列表
-                    if 'sprs' in obj.zyzt['splc'][index]:
-                        sprs = obj.zyzt['splc'][index]['sprs']
-                    else:
-                        sprs = [obj.zyzt['splc'][index]['spr']]
-                    jdmc = obj.zyzt['splc'][index]['jdmc']
-                    obj.zyzt['jdmc'] = jdmc
-                    obj.todousers = sprs
-                    obj.save()
-                    postdict={
-                        'touser':'',
-                        'template_id':'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0',
-                        'miniprogram':{'appid':'wx5c39b569f01c27db'},
-                        'data':{
-                            'first':{
-                                'value':obj.zylx.dickeyname + '作业审批,审批节点:' + obj.zyzt['jdmc']
-                                },
-                            'keyword1':{
-                                'value':obj.zynr
-                                },
-                            'keyword2':{
-                                'value':obj.kssj
-                                },
-                            'keyword3':{
-                                'value':obj.zydd
-                                },
-                            'remark':{
-                                'value':'请您及时完成审批!'
-                                }
-                            }
-                        }
-                    tolist = list(User.objects.filter(userid__in=sprs).values_list('openid',flat=True))
-                    send_wechatmsgs.delay(postdict,tolist)
-                    return JsonResponse({"code":1})
             else:
                 Operzyry.objects.create(oper=obj,operzyry=x)
                 b.append(x.openid)
-
+        if b:
+            pass
+        else:#工作人员全部确认
+            obj.zyzt['zyzt'] = '审批中'
+            obj.zyzt['index'] = 0
+            index = obj.zyzt['index']
+            sprs = [] #初始化审批人列表
+            if 'sprs' in obj.zyzt['splc'][index]:
+                sprs = obj.zyzt['splc'][index]['sprs']
+            else:
+                sprs = [obj.zyzt['splc'][index]['spr']]
+            jdmc = obj.zyzt['splc'][index]['jdmc']
+            obj.zyzt['jdmc'] = jdmc
+            obj.todousers = sprs
+            obj.save()
+            postdict={
+                'touser':'',
+                'template_id':'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0',
+                'miniprogram':{'appid':'wx5c39b569f01c27db'},
+                'data':{
+                    'first':{
+                        'value':obj.zylx.dickeyname + '作业审批,审批节点:' + obj.zyzt['jdmc']
+                        },
+                    'keyword1':{
+                        'value':obj.zynr
+                        },
+                    'keyword2':{
+                        'value':obj.kssj
+                        },
+                    'keyword3':{
+                        'value':obj.zydd
+                        },
+                    'remark':{
+                        'value':'请您及时完成审批!'
+                        }
+                    }
+                }
+            tolist = list(User.objects.filter(userid__in=sprs).values_list('openid',flat=True))
+            send_wechatmsgs.delay(postdict,tolist)
+            return JsonResponse({"code":1})
         postdict={
         'touser':'',
         'template_id':'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0',