From 1b430f9d7a22c6dab9c6915a6a287f2d41c03ee1 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 11 Nov 2020 17:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=B9=E8=AE=AD=E6=8F=90?=
 =?UTF-8?q?=E9=86=92bug;=E8=AF=81=E4=B9=A6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 groups/views.py                              |  3 ++-
 safesite/static/safesite/mystatic/js/util.js |  2 +-
 safesite/tasks.py                            | 12 +++++++-----
 safesite/templates/safecert.html             |  1 +
 safesite/templates/socert.html               |  1 +
 safesite/views.py                            | 13 +++++++------
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/groups/views.py b/groups/views.py
index 28d5549c..80f5e17f 100644
--- a/groups/views.py
+++ b/groups/views.py
@@ -19,7 +19,8 @@ from django.views.generic import View,TemplateView,CreateView,UpdateView
 from django.contrib.auth.hashers import make_password, check_password
 from django.core.serializers.json import DjangoJSONEncoder
 from .forms import CompanyForm
-
+from uuid import UUID
+import decimal
 
 def fenye(request):
     start = request.GET.get('offset',None)
diff --git a/safesite/static/safesite/mystatic/js/util.js b/safesite/static/safesite/mystatic/js/util.js
index 11b27ea9..8364bc05 100644
--- a/safesite/static/safesite/mystatic/js/util.js
+++ b/safesite/static/safesite/mystatic/js/util.js
@@ -18,7 +18,7 @@ $.ajaxSetup({
             });
             }else if(jsonData.code == 0){
               //其他的异常情况,给个提示。
-              $.messager.alert('错误','操作失败!','error');
+            //   $.messager.alert('错误','操作失败!','error');
             }else{
               //正常情况就不统一处理了
             }
diff --git a/safesite/tasks.py b/safesite/tasks.py
index e5626a2e..4dd91671 100644
--- a/safesite/tasks.py
+++ b/safesite/tasks.py
@@ -434,8 +434,8 @@ def updateTzzs():
                     updated_values['zszt'] = guoqi(i['应复审日期'])
                 except:
                     pass
-                obj, created = Socertificate.objects.update_or_create(
-                cardnum=x.cardnum, czxm=i['操作项目'], defaults=updated_values)
+                # obj, created = Socertificate.objects.update_or_create(
+                # cardnum=x.cardnum, czxm=i['操作项目'], defaults=updated_values)
                 try:
                     obj = Socertificate.objects.get(cardnum=x.cardnum, czxm=i['操作项目'])
                     if obj.yxqjssj.strftime('%Y-%m-%d')<i['有效期结束时间']:
@@ -452,6 +452,7 @@ def updateTzzs():
                 except:
                     obj = Socertificate(**updated_values)
                     obj.save()
+                print(obj.realname, obj.yfsrq)
                     
 def guoqi(x):
     now = datetime.datetime.now()
@@ -465,7 +466,8 @@ def guoqi(x):
 
 @shared_task
 def updateAqzs():
-    for x in Safecert.objects.all():
+    queryset = Safecert.objects.filter(yfsrq__lte = datetime.datetime.now()+datetime.timedelta(days=200))
+    for x in queryset:
         data = getAqzs(x.cardnum,x.realname)
         time.sleep(10)
         if data:
@@ -486,8 +488,8 @@ def updateAqzs():
                     updated_values['zszt'] = guoqi(i['有效期结束时间'])
                 except:
                     pass
-                obj, created = Safecert.objects.update_or_create(
-                cardnum=x.cardnum, zglx=i['资格类型'], dwlx=i['单位类型'], defaults=updated_values)
+                # obj, created = Safecert.objects.update_or_create(
+                # cardnum=x.cardnum, zglx=i['资格类型'], dwlx=i['单位类型'], defaults=updated_values)
                 try:
                     obj = Safecert.objects.get(cardnum=x.cardnum, zglx=i['资格类型'], dwlx=i['单位类型'])
                     if obj.yxqjssj.strftime('%Y-%m-%d')<i['有效期结束时间']:
diff --git a/safesite/templates/safecert.html b/safesite/templates/safecert.html
index 5fd6d1c1..ab8b2487 100644
--- a/safesite/templates/safecert.html
+++ b/safesite/templates/safecert.html
@@ -50,6 +50,7 @@
             { field: 'id', title: 'ID', hidden: true },
             { field: 'realname', title: '姓名', width: 80 },
             { field: 'gender', title: '性别', width: 40 },
+            { field: 'cardnum', title: '身份证号', width: 100 },
             { field: 'zglx', title: '资格类型', width: 100 },
             { field: 'fzjg', title: '发证机关', width: 100 },
             { field: 'dwlx', title: '单位类型', width: 100 ,sortable:true},
diff --git a/safesite/templates/socert.html b/safesite/templates/socert.html
index d4caada2..64107453 100644
--- a/safesite/templates/socert.html
+++ b/safesite/templates/socert.html
@@ -81,6 +81,7 @@
             { field: 'id', title: 'ID', hidden: true },
             { field: 'realname', title: '姓名', width: 80 },
             { field: 'gender', title: '性别', width: 40 },
+            { field: 'cardnum', title: '身份证号', width: 100 },
             { field: 'zylb', title: '作业类别', width: 100 },
             { field: 'fzjg', title: '发证机关', width: 100 },
             { field: 'czxm', title: '操作项目', width: 100 ,sortable:true},
diff --git a/safesite/views.py b/safesite/views.py
index 12fb5fa5..d029934f 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -3108,7 +3108,7 @@ def pxhandle(req):
         userid = req.session['userid']
         companyid = getcompany(userid)
         dqdnum = Trainuser.objects.filter(participant=User.objects.get(
-            userid=userid), checked=0, train__deletemark=1).count()
+            userid=userid), checked=0, train__deletemark=1, train__state=1).count()
         return JsonResponse({'code': 1, 'dqdnum': dqdnum})
     elif req.GET.get('a') == 'detail':
         trainid = req.GET.get('trainid')
@@ -4047,7 +4047,7 @@ def apisocert(req):
         if req.GET.get('sort'):
             a = a.order_by(req.GET.get('sort'))
         a = a[startnum:endnum].values('id', 'realname', 'gender', 'zylb', 'czxm',
-                                      'fzjg', 'ccfzrq', 'yfsrq', 'yxqkssj', 'yxqjssj', 'sjfssj', 'zszt', 'url')
+                                      'fzjg', 'ccfzrq', 'yfsrq', 'yxqkssj', 'yxqjssj', 'sjfssj', 'zszt', 'url', 'cardnum')
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif a == 'listself':
         userid = req.session['userid']
@@ -4058,7 +4058,7 @@ def apisocert(req):
         if req.GET.get('sort'):
             a = a.order_by(req.GET.get('sort'))
         a = a.values('id', 'realname', 'gender', 'zylb', 'czxm', 'fzjg',
-                     'ccfzrq', 'yfsrq', 'yxqkssj', 'yxqjssj', 'sjfssj', 'zszt', 'url')
+                     'ccfzrq', 'yfsrq', 'yxqkssj', 'yxqjssj', 'sjfssj', 'zszt', 'url',  'cardnum')
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif a == 'addspider':
         postdata = json.loads(req.body.decode('utf-8'))
@@ -4218,7 +4218,7 @@ def apisafecert(req):
         if req.GET.get('sort'):
             a = a.order_by(req.GET.get('sort'))
         a = a[startnum:endnum].values('id', 'realname', 'gender', 'zglx',
-                                      'dwlx', 'fzjg', 'yfsrq', 'yxqkssj', 'yxqjssj', 'zszt', 'url')
+                                      'dwlx', 'fzjg', 'yfsrq', 'yxqkssj', 'yxqjssj', 'zszt', 'url', 'cardnum')
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif a == 'listself':
         userid = req.session['userid']
@@ -4229,7 +4229,7 @@ def apisafecert(req):
         if req.GET.get('sort'):
             a = a.order_by(req.GET.get('sort'))
         a = a.values('id', 'realname', 'gender', 'zglx', 'dwlx',
-                     'fzjg', 'yfsrq', 'yxqkssj', 'yxqjssj', 'zszt', 'url')
+                     'fzjg', 'yfsrq', 'yxqkssj', 'yxqjssj', 'zszt', 'url', 'cardnum')
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif a == 'addspider':
         postdata = json.loads(req.body.decode('utf-8'))
@@ -6581,7 +6581,8 @@ def apiquestioncat(req):
             pass
         else:
             companys = Partment.objects.filter(partid=companyid).values_list('partid', flat=True)
-        list_items = (Questioncat.objects.filter(usecomp__in=companys, deletemark=1)).annotate(
+        list_items = (Questioncat.objects.filter(usecomp__in=companys, deletemark=1)| Questioncat.objects.filter(
+            usecomp__partid=1, deletemark=1)).annotate(
             parentId=F('parent__id')).values('id', 'parentId', 'name')
         return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
     elif a == 'tree':