证书查询修改part1

groups/migrations/0010_auto_20201115_2158.py

@@ -0,0 +1,37 @@
+# Generated by Django 2.2.8 on 2020-11-15 21:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('groups', '0009_groupuser_issuper'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='groupmember',
+            options={'verbose_name': '集团-公司', 'verbose_name_plural': '集团-公司'},
+        ),
+        migrations.AlterModelOptions(
+            name='groupuser',
+            options={'verbose_name': '管理员', 'verbose_name_plural': '管理员'},
+        ),
+        migrations.AlterField(
+            model_name='group',
+            name='members',
+            field=models.ManyToManyField(related_name='group_members', through='groups.Groupmember', to='safesite.Partment'),
+        ),
+        migrations.AlterField(
+            model_name='groupmember',
+            name='group',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='groupmember_group', to='groups.Group'),
+        ),
+        migrations.AlterField(
+            model_name='groupmember',
+            name='member',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='groupmember_member', to='safesite.Partment'),
+        ),
+    ]

safesite/migrations/0365_auto_20201115_2158.py

@@ -0,0 +1,44 @@
+# Generated by Django 2.2.8 on 2020-11-15 21:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('safesite', '0364_auto_20201027_1656'),
+    ]
+
+    operations = [
+        # migrations.RemoveField(
+        #     model_name='companyinfo',
+        #     name='liaison_fax',
+        # ),
+        migrations.AlterField(
+            model_name='user',
+            name='password',
+            field=models.CharField(max_length=200),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='cardnum',
+            field=models.CharField(default='', max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='gender',
+            field=models.CharField(default='男', max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='realname',
+            field=models.CharField(default='', max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='user',
+            field=models.OneToOneField(default=1, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'),
+            preserve_default=False,
+        ),
+    ]

safesite/models.py

@@ -97,7 +97,7 @@ class User(models.Model):
     empid = models.CharField(max_length=20, blank=True, null=True)  # 工号
     username = models.CharField(max_length=30, unique=True)  # 账号
     name = models.CharField(max_length=20)
-    password = models.CharField(max_length=30)
+    password = models.CharField(max_length=200)
     epassword = models.CharField(max_length=200, blank=True, null=True)
     ubelongpart = models.ForeignKey(
         Partment, related_name='upart', on_delete=models.CASCADE)
@@ -133,11 +133,10 @@ class User(models.Model):
 
 class Userprofile(models.Model):
     id = models.AutoField(primary_key=True)
-    user = models.OneToOneField(
-        User, null=True, blank=True, on_delete=models.CASCADE)
-    realname = models.CharField(max_length=50)  # 真实姓名
-    gender = models.CharField(max_length=50)  # 性别
-    cardnum = models.CharField(max_length=50)  # 身份证号
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
+    realname = models.CharField(max_length=50, default='')  # 真实姓名
+    gender = models.CharField(max_length=50, default='男')  # 性别
+    cardnum = models.CharField(max_length=50, default='')  # 身份证号
 
 
 class Dicclass(models.Model):

safesite/templates/safecert.html

@@ -48,9 +48,9 @@
         border:false,
         columns: [[
             { field: 'id', title: 'ID', hidden: true },
-            { field: 'realname', title: '姓名', width: 80 },
-            { field: 'gender', title: '性别', width: 40 },
-            { field: 'cardnum', title: '身份证号', width: 100 },
+            { field: 'user__userprofile__realname', title: '姓名', width: 80 },
+            { field: 'user__userprofile__gender', title: '性别', width: 40 },
+            { field: 'user__userprofile__cardnum', title: '身份证号', width: 100 },
             { field: 'zglx', title: '资格类型', width: 100 },
             { field: 'fzjg', title: '发证机关', width: 100 },
             { field: 'dwlx', title: '单位类型', width: 100 ,sortable:true},

safesite/templates/socert.html

@@ -79,9 +79,9 @@
         border:false,
         columns: [[
             { field: 'id', title: 'ID', hidden: true },
-            { field: 'realname', title: '姓名', width: 80 },
-            { field: 'gender', title: '性别', width: 40 },
-            { field: 'cardnum', title: '身份证号', width: 100 },
+            { field: 'user__userprofile__realname', title: '姓名', width: 80 },
+            { field: 'user__userprofile__gender', title: '性别', width: 40 },
+            { field: 'user__userprofile__cardnum', title: '身份证号', width: 100 },
             { field: 'zylb', title: '作业类别', width: 100 },
             { field: 'fzjg', title: '发证机关', width: 100 },
             { field: 'czxm', title: '操作项目', width: 100 ,sortable:true},

safesite/templates/socertadd.html

@@ -6,7 +6,7 @@
     </div>
     <div data-options="region:'center'" style="height:100%;padding:15px 15px;">
         <form id="tzzsff" method="post" name="tzzsff" enctype="multipart/form-data">
-            <p style="color:red;">请输入相关信息后提交进行联网查询证书</p>
+            <!-- <p style="color:red;">请输入相关信息后提交进行联网查询证书</p> -->
             <div style="margin-bottom:5px">
                 <input id="tzzyry" class="easyui-textbox" style="width:480px" data-options="label:'员工',prompt:'请选择'" required=true
                     editable=false>
@@ -14,13 +14,41 @@
                 <a id="choosetzzyry" class='easyui-linkbutton' onclick="choosetzzyry()" style="width:auto">选择</a>
             </div>
             <div style="margin-bottom:5px">
+                <input id="zylb" class="easyui-textbox" name="zylb" style="width:480px" data-options="
+                label:'作业类别'," required=true>
+            </div>
+            <div style="margin-bottom:5px">
+                <input id="fzjg" class="easyui-textbox" name="fzjg" style="width:480px" data-options="
+                label:'发证机关'," required=true>
+            </div>
+            <div style="margin-bottom:5px">
+                <input id="czxm" class="easyui-textbox" name="czxm" style="width:480px" data-options="
+                label:'操作项目'," required=true>
+            </div>
+            <div style="margin-bottom:5px">
+                <input id="ccfzrq" class="easyui-datebox" name="ccfzrq" style="width:480px" data-options="
+                label:'初次发证'," required=true editable=false>
+            </div>
+            <div style="margin-bottom:5px">
+                <input id="yfsrq" class="easyui-datebox" name="yfsrq" style="width:480px" data-options="
+                label:'应复审'," >
+            </div>
+            <div style="margin-bottom:5px">
+                <input id="yxqkssj" class="easyui-datebox" name="yxqkssj" style="width:480px" data-options="
+                label:'有效期开始'," required=true editable=false>
+            </div>
+            <div style="margin-bottom:5px">
+                <input id="yxqjssj" class="easyui-datebox" name="yfsrq" style="width:480px" data-options="
+                label:'有效期结束'," required=true editable=false> 
+            </div>
+            <!-- <div style="margin-bottom:5px">
                 <input id="realname" class="easyui-textbox" name="realname" style="width:480px" data-options="
                 label:'真实姓名'," required=true>
             </div>
             <div style="margin-bottom:5px">
                 <input id="cardnum" class="easyui-textbox" name="cardnum" style="width:480px" data-options="
                 label:'身份证号'," required=true>
-            </div>
+            </div> -->
         </form>
     </div>
 </div>

safesite/views.py

@@ -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', 'cardnum')
+                                      'fzjg', 'ccfzrq', 'yfsrq', 'yxqkssj', 'yxqjssj', 'sjfssj', 'zszt', 'url', 'cardnum', 'user__userprofile__realname', 'user__userprofile__gender', 'user__userprofile__cardnum')
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif a == 'listself':
         userid = req.session['userid']
@@ -4060,118 +4060,118 @@ def apisocert(req):
         a = a.values('id', 'realname', 'gender', 'zylb', 'czxm', 'fzjg',
                      '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'))
-        userid = postdata['userid']
-        realname = postdata['realname']
-        cardnum = postdata['cardnum']
-        companyid = getcompany(userid)
-        data = getTzzs(cardnum, realname)
-        data1 = []
-        gender = ''
-        if data:
-            for i in data:
-                if i['操作项目'] not in data1:
-                    updated_values = {
-                        'user': User.objects.get(userid=userid),
-                        'usecomp': Partment.objects.get(partid=companyid),
-                        'realname': i['姓名'],
-                        'gender': i['性别'],
-                        'zylb': i['作业类别'],
-                        'czxm': i['操作项目'],
-                        'fzjg': i['发证机关'],
-                        'ccfzrq': i['初次发证日期'] if i['初次发证日期'] else None,
-                        'yfsrq': i['应复审日期'] if i['应复审日期'] else None,
-                        'yxqkssj': i['有效期开始时间'] if i['有效期开始时间'] else None,
-                        'yxqjssj': i['有效期结束时间'] if i['有效期结束时间'] else None,
-                        'sjfssj': i['实际复审时间'] if i['实际复审时间'] else None,
-                        'url': i['url'],
-                    }
-                    try:
-                        updated_values['zszt'] = guoqi(i['应复审日期'])
-                    except:
-                        pass
-                    obj, created = Socertificate.objects.update_or_create(
-                        cardnum=cardnum, czxm=i['操作项目'], defaults=updated_values)
-                    data1.append(i['操作项目'])
-                    gender = i['性别']
-                else:
-                    obj = Socertificate.objects.get(
-                        cardnum=cardnum, czxm=i['操作项目'])
-                    if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']:
-                        obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None
-                        obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None
-                        obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None
-                        obj.sjfssj = i['实际复审时间'] if i['实际复审时间'] else None
-                        try:
-                            zsst = guoqi(i['应复审日期'])
-                            obj.zszt = zsst
-                        except:
-                            pass
-                        obj.save()
-            try:
-                obj = Userprofile.objects.get(user__userid=userid)
-                obj.realname = realname
-                obj.cardnum = cardnum
-                obj.gender = gender
-                obj.save()
-            except Userprofile.DoesNotExist:
-                obj = Userprofile(user=User.objects.get(
-                    userid=userid), realname=realname, cardnum=cardnum, gender=gender)
-                obj.save()
-            return JsonResponse({"code": 1})
-        else:
-            return JsonResponse({"code": 0})
-    elif a == 'addspiderself':
-        userid = req.session['userid']
-        a = Userprofile.objects.get(user__userid=userid)
-        realname = a.realname
-        cardnum = a.cardnum
-        companyid = getcompany(userid)
-        data = getTzzs(cardnum, realname)
-        data1 = []
-        gender = ''
-        if data:
-            for i in data:
-                if i['操作项目'] not in data1:
-                    updated_values = {
-                        'user': User.objects.get(userid=userid),
-                        'usecomp': Partment.objects.get(partid=companyid),
-                        'realname': i['姓名'],
-                        'gender': i['性别'],
-                        'zylb': i['作业类别'],
-                        'czxm': i['操作项目'],
-                        'fzjg': i['发证机关'],
-                        'ccfzrq': i['初次发证日期'] if i['初次发证日期'] else None,
-                        'yfsrq': i['应复审日期'] if i['应复审日期'] else None,
-                        'yxqkssj': i['有效期开始时间'] if i['有效期开始时间'] else None,
-                        'yxqjssj': i['有效期结束时间'] if i['有效期结束时间'] else None,
-                        'sjfssj': i['实际复审时间'] if i['实际复审时间'] else None,
-                        'url': i['url'],
-                    }
-                    try:
-                        updated_values['zszt'] = guoqi(i['应复审日期'])
-                    except:
-                        pass
-                    obj, created = Socertificate.objects.update_or_create(
-                        cardnum=cardnum, czxm=i['操作项目'], defaults=updated_values)
-                    data1.append(i['操作项目'])
-                    gender = i['性别']
-                else:
-                    obj = Socertificate.objects.get(
-                        cardnum=cardnum, czxm=i['操作项目'])
-                    if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']:
-                        obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None
-                        obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None
-                        obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None
-                        obj.sjfssj = i['实际复审时间'] if i['实际复审时间'] else None
-                        try:
-                            zsst = guoqi(i['应复审日期'])
-                            obj.zszt = zsst
-                        except:
-                            pass
-                        obj.save()
-        return JsonResponse({"code": 1})
+    # elif a == 'addspider':
+    #     postdata = json.loads(req.body.decode('utf-8'))
+    #     userid = postdata['userid']
+    #     realname = postdata['realname']
+    #     cardnum = postdata['cardnum']
+    #     companyid = getcompany(userid)
+    #     data = getTzzs(cardnum, realname)
+    #     data1 = []
+    #     gender = ''
+    #     if data:
+    #         for i in data:
+    #             if i['操作项目'] not in data1:
+    #                 updated_values = {
+    #                     'user': User.objects.get(userid=userid),
+    #                     'usecomp': Partment.objects.get(partid=companyid),
+    #                     'realname': i['姓名'],
+    #                     'gender': i['性别'],
+    #                     'zylb': i['作业类别'],
+    #                     'czxm': i['操作项目'],
+    #                     'fzjg': i['发证机关'],
+    #                     'ccfzrq': i['初次发证日期'] if i['初次发证日期'] else None,
+    #                     'yfsrq': i['应复审日期'] if i['应复审日期'] else None,
+    #                     'yxqkssj': i['有效期开始时间'] if i['有效期开始时间'] else None,
+    #                     'yxqjssj': i['有效期结束时间'] if i['有效期结束时间'] else None,
+    #                     'sjfssj': i['实际复审时间'] if i['实际复审时间'] else None,
+    #                     'url': i['url'],
+    #                 }
+    #                 try:
+    #                     updated_values['zszt'] = guoqi(i['应复审日期'])
+    #                 except:
+    #                     pass
+    #                 obj, created = Socertificate.objects.update_or_create(
+    #                     cardnum=cardnum, czxm=i['操作项目'], defaults=updated_values)
+    #                 data1.append(i['操作项目'])
+    #                 gender = i['性别']
+    #             else:
+    #                 obj = Socertificate.objects.get(
+    #                     cardnum=cardnum, czxm=i['操作项目'])
+    #                 if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']:
+    #                     obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None
+    #                     obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None
+    #                     obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None
+    #                     obj.sjfssj = i['实际复审时间'] if i['实际复审时间'] else None
+    #                     try:
+    #                         zsst = guoqi(i['应复审日期'])
+    #                         obj.zszt = zsst
+    #                     except:
+    #                         pass
+    #                     obj.save()
+    #         try:
+    #             obj = Userprofile.objects.get(user__userid=userid)
+    #             obj.realname = realname
+    #             obj.cardnum = cardnum
+    #             obj.gender = gender
+    #             obj.save()
+    #         except Userprofile.DoesNotExist:
+    #             obj = Userprofile(user=User.objects.get(
+    #                 userid=userid), realname=realname, cardnum=cardnum, gender=gender)
+    #             obj.save()
+    #         return JsonResponse({"code": 1})
+    #     else:
+    #         return JsonResponse({"code": 0})
+    # elif a == 'addspiderself':
+    #     userid = req.session['userid']
+    #     a = Userprofile.objects.get(user__userid=userid)
+    #     realname = a.realname
+    #     cardnum = a.cardnum
+    #     companyid = getcompany(userid)
+    #     data = getTzzs(cardnum, realname)
+    #     data1 = []
+    #     gender = ''
+    #     if data:
+    #         for i in data:
+    #             if i['操作项目'] not in data1:
+    #                 updated_values = {
+    #                     'user': User.objects.get(userid=userid),
+    #                     'usecomp': Partment.objects.get(partid=companyid),
+    #                     'realname': i['姓名'],
+    #                     'gender': i['性别'],
+    #                     'zylb': i['作业类别'],
+    #                     'czxm': i['操作项目'],
+    #                     'fzjg': i['发证机关'],
+    #                     'ccfzrq': i['初次发证日期'] if i['初次发证日期'] else None,
+    #                     'yfsrq': i['应复审日期'] if i['应复审日期'] else None,
+    #                     'yxqkssj': i['有效期开始时间'] if i['有效期开始时间'] else None,
+    #                     'yxqjssj': i['有效期结束时间'] if i['有效期结束时间'] else None,
+    #                     'sjfssj': i['实际复审时间'] if i['实际复审时间'] else None,
+    #                     'url': i['url'],
+    #                 }
+    #                 try:
+    #                     updated_values['zszt'] = guoqi(i['应复审日期'])
+    #                 except:
+    #                     pass
+    #                 obj, created = Socertificate.objects.update_or_create(
+    #                     cardnum=cardnum, czxm=i['操作项目'], defaults=updated_values)
+    #                 data1.append(i['操作项目'])
+    #                 gender = i['性别']
+    #             else:
+    #                 obj = Socertificate.objects.get(
+    #                     cardnum=cardnum, czxm=i['操作项目'])
+    #                 if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']:
+    #                     obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None
+    #                     obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None
+    #                     obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None
+    #                     obj.sjfssj = i['实际复审时间'] if i['实际复审时间'] else None
+    #                     try:
+    #                         zsst = guoqi(i['应复审日期'])
+    #                         obj.zszt = zsst
+    #                     except:
+    #                         pass
+    #                     obj.save()
+    #     return JsonResponse({"code": 1})
     elif a == 'del':
         id = req.GET.get('id')
         userid = req.session['userid']
@@ -4184,7 +4184,7 @@ def apisocert(req):
     elif a == 'detail':
         id = req.GET.get('id')
         a = Socertificate.objects.filter(id=id).values(
-            'id', 'realname', 'gender', 'zylb', 'czxm', 'fzjg', 'ccfzrq', 'yfsrq', 'yxqkssj', 'yxqjssj', 'sjfssj')
+            'id', 'realname', 'gender', 'zylb', 'czxm', 'fzjg', 'ccfzrq', 'yfsrq', 'yxqkssj', 'yxqjssj', 'sjfssj', 'user__userprofile__realname', 'user__userprofile__gender', 'user__userprofile__cardnum')
         return JsonResponse(a[0])
     elif a == 'getjson':
         cardnum = req.GET.get('cardnum')
@@ -4193,6 +4193,12 @@ def apisocert(req):
     elif a == 'updateTzzs':
         updateTzzs()
 
+def apisocert_create(req):
+    postdata = json.loads(req.body.decode('utf-8'))
+    reqdata = {}
+    reqdata['zylb'] = postdata['zylb']
+    pass
+    
 
 def guoqi(x):
     now = datetime.now()
@@ -4218,7 +4224,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', 'cardnum')
+                                      'dwlx', 'fzjg', 'yfsrq', 'yxqkssj', 'yxqjssj', 'zszt', 'url', 'cardnum', 'user__userprofile__realname', 'user__userprofile__gender', 'user__userprofile__cardnum')
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif a == 'listself':
         userid = req.session['userid']
@@ -4229,113 +4235,113 @@ 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', 'cardnum')
+                     'fzjg', 'yfsrq', 'yxqkssj', 'yxqjssj', 'zszt', 'url', 'cardnum', 'user__userprofile__realname', 'user__userprofile__gender', 'user__userprofile__cardnum')
         return HttpResponse(transjson(total, a), content_type="application/json")
-    elif a == 'addspider':
-        postdata = json.loads(req.body.decode('utf-8'))
-        userid = postdata['userid']
-        realname = postdata['realname']
-        cardnum = postdata['cardnum']
-        companyid = getcompany(userid)
-        data = getAqzs(cardnum, realname)
-        data1 = []
-        gender = ''
-        if data:
-            for i in data:
-                if i['资格类型'] not in data1:
-                    updated_values = {
-                        'user': User.objects.get(userid=userid),
-                        'usecomp': Partment.objects.get(partid=companyid),
-                        'realname': i['姓名'],
-                        'gender': i['性别'],
-                        'zglx': i['资格类型'],
-                        'dwlx': i['单位类型'],
-                        'fzjg': i['发证机关'],
-                        'yfsrq': i['应复审日期'] if i['应复审日期'] else None,
-                        'yxqkssj': i['有效期开始时间'] if i['有效期开始时间'] else None,
-                        'yxqjssj': i['有效期结束时间'] if i['有效期结束时间'] else None,
-                        'url': i['url'],
-                    }
-                    try:
-                        updated_values['zszt'] = guoqi(i['应复审日期'])
-                    except:
-                        pass
-                    obj, created = Safecert.objects.update_or_create(
-                        cardnum=cardnum, zglx=i['资格类型'], defaults=updated_values)
-                    data1.append(i['资格类型'])
-                    gender = i['性别']
-                else:
-                    obj = Safecert.objects.get(cardnum=cardnum, zglx=i['资格类型'])
-                    if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']:
-                        obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None
-                        obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None
-                        obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None
-                        try:
-                            zsst = guoqi(i['应复审日期'])
-                            obj.zszt = zsst
-                        except:
-                            pass
-                        obj.save()
-            try:
-                obj = Userprofile.objects.get(user__userid=userid)
-                obj.realname = realname
-                obj.cardnum = cardnum
-                obj.gender = gender
-                obj.save()
-            except Userprofile.DoesNotExist:
-                obj = Userprofile(user=User.objects.get(
-                    userid=userid), realname=realname, cardnum=cardnum, gender=gender)
-                obj.save()
-            return JsonResponse({"code": 1})
-        else:
-            return JsonResponse({"code": 0})
-    elif a == 'addspiderself':
-        userid = req.session['userid']
-        a = Userprofile.objects.get(user__userid=userid)
-        realname = a.realname
-        cardnum = a.cardnum
-        companyid = getcompany(userid)
-        data = getAqzs(cardnum, realname)
-        data1 = []
-        gender = ''
-        if data:
-            for i in data:
-                if i['资格类型'] not in data1:
-                    updated_values = {
-                        'user': User.objects.get(userid=userid),
-                        'usecomp': Partment.objects.get(partid=companyid),
-                        'realname': i['姓名'],
-                        'gender': i['性别'],
-                        'zglx': i['资格类型'],
-                        'dwlx': i['单位类型'],
-                        'fzjg': i['发证机关'],
-                        'yfsrq': i['应复审日期'] if i['应复审日期'] else None,
-                        'yxqkssj': i['有效期开始时间'] if i['有效期开始时间'] else None,
-                        'yxqjssj': i['有效期结束时间'] if i['有效期结束时间'] else None,
-                        'url': i['url'],
-                    }
-                    try:
-                        updated_values['zszt'] = guoqi(i['应复审日期'])
-                    except:
-                        pass
-                    obj, created = Safecert.objects.update_or_create(
-                        cardnum=cardnum, zglx=i['资格类型'], defaults=updated_values)
-                    data1.append(i['资格类型'])
-                    gender = i['性别']
-                else:
-                    obj = Socertificate.objects.get(
-                        cardnum=cardnum, czxm=i['资格类型'])
-                    if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']:
-                        obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None
-                        obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None
-                        obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None
-                        try:
-                            zsst = guoqi(i['应复审日期'])
-                            obj.zszt = zsst
-                        except:
-                            pass
-                        obj.save()
-        return JsonResponse({"code": 1})
+    # elif a == 'addspider':
+    #     postdata = json.loads(req.body.decode('utf-8'))
+    #     userid = postdata['userid']
+    #     realname = postdata['realname']
+    #     cardnum = postdata['cardnum']
+    #     companyid = getcompany(userid)
+    #     data = getAqzs(cardnum, realname)
+    #     data1 = []
+    #     gender = ''
+    #     if data:
+    #         for i in data:
+    #             if i['资格类型'] not in data1:
+    #                 updated_values = {
+    #                     'user': User.objects.get(userid=userid),
+    #                     'usecomp': Partment.objects.get(partid=companyid),
+    #                     'realname': i['姓名'],
+    #                     'gender': i['性别'],
+    #                     'zglx': i['资格类型'],
+    #                     'dwlx': i['单位类型'],
+    #                     'fzjg': i['发证机关'],
+    #                     'yfsrq': i['应复审日期'] if i['应复审日期'] else None,
+    #                     'yxqkssj': i['有效期开始时间'] if i['有效期开始时间'] else None,
+    #                     'yxqjssj': i['有效期结束时间'] if i['有效期结束时间'] else None,
+    #                     'url': i['url'],
+    #                 }
+    #                 try:
+    #                     updated_values['zszt'] = guoqi(i['应复审日期'])
+    #                 except:
+    #                     pass
+    #                 obj, created = Safecert.objects.update_or_create(
+    #                     cardnum=cardnum, zglx=i['资格类型'], defaults=updated_values)
+    #                 data1.append(i['资格类型'])
+    #                 gender = i['性别']
+    #             else:
+    #                 obj = Safecert.objects.get(cardnum=cardnum, zglx=i['资格类型'])
+    #                 if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']:
+    #                     obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None
+    #                     obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None
+    #                     obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None
+    #                     try:
+    #                         zsst = guoqi(i['应复审日期'])
+    #                         obj.zszt = zsst
+    #                     except:
+    #                         pass
+    #                     obj.save()
+    #         try:
+    #             obj = Userprofile.objects.get(user__userid=userid)
+    #             obj.realname = realname
+    #             obj.cardnum = cardnum
+    #             obj.gender = gender
+    #             obj.save()
+    #         except Userprofile.DoesNotExist:
+    #             obj = Userprofile(user=User.objects.get(
+    #                 userid=userid), realname=realname, cardnum=cardnum, gender=gender)
+    #             obj.save()
+    #         return JsonResponse({"code": 1})
+    #     else:
+    #         return JsonResponse({"code": 0})
+    # elif a == 'addspiderself':
+    #     userid = req.session['userid']
+    #     a = Userprofile.objects.get(user__userid=userid)
+    #     realname = a.realname
+    #     cardnum = a.cardnum
+    #     companyid = getcompany(userid)
+    #     data = getAqzs(cardnum, realname)
+    #     data1 = []
+    #     gender = ''
+    #     if data:
+    #         for i in data:
+    #             if i['资格类型'] not in data1:
+    #                 updated_values = {
+    #                     'user': User.objects.get(userid=userid),
+    #                     'usecomp': Partment.objects.get(partid=companyid),
+    #                     'realname': i['姓名'],
+    #                     'gender': i['性别'],
+    #                     'zglx': i['资格类型'],
+    #                     'dwlx': i['单位类型'],
+    #                     'fzjg': i['发证机关'],
+    #                     'yfsrq': i['应复审日期'] if i['应复审日期'] else None,
+    #                     'yxqkssj': i['有效期开始时间'] if i['有效期开始时间'] else None,
+    #                     'yxqjssj': i['有效期结束时间'] if i['有效期结束时间'] else None,
+    #                     'url': i['url'],
+    #                 }
+    #                 try:
+    #                     updated_values['zszt'] = guoqi(i['应复审日期'])
+    #                 except:
+    #                     pass
+    #                 obj, created = Safecert.objects.update_or_create(
+    #                     cardnum=cardnum, zglx=i['资格类型'], defaults=updated_values)
+    #                 data1.append(i['资格类型'])
+    #                 gender = i['性别']
+    #             else:
+    #                 obj = Socertificate.objects.get(
+    #                     cardnum=cardnum, czxm=i['资格类型'])
+    #                 if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']:
+    #                     obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None
+    #                     obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None
+    #                     obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None
+    #                     try:
+    #                         zsst = guoqi(i['应复审日期'])
+    #                         obj.zszt = zsst
+    #                     except:
+    #                         pass
+    #                     obj.save()
+    #     return JsonResponse({"code": 1})
     elif a == 'del':
         id = req.GET.get('id')
         userid = req.session['userid']
@@ -4348,7 +4354,7 @@ def apisafecert(req):
     elif a == 'detail':
         id = req.GET.get('id')
         a = Safecert.objects.filter(id=id).values(
-            'id', 'realname', 'gender', 'zglx', 'dwlx', 'fzjg', 'yfsrq', 'yxqkssj', 'yxqjssj', 'zszt', 'url')
+            'id', 'realname', 'gender', 'zglx', 'dwlx', 'fzjg', 'yfsrq', 'yxqkssj', 'yxqjssj', 'zszt', 'url', 'user__userprofile__realname', 'user__userprofile__gender', 'user__userprofile__cardnum')
         return JsonResponse(a[0])
     elif a == 'getjson':
         cardnum = req.GET.get('cardnum')
@@ -5010,6 +5016,12 @@ def apitool(req):
         # print(Trouble.objects.filter(deletemark=1).count(), objs.count())
         objs.update(zgbm=F('fxbm'), zgr=F('fxr'))
         return JsonResponse({"code":1})
+    elif a == 'correct_userprofile':
+        print(Userprofile.objects.filter(user__isnull=True).count())
+        # Userprofile.objects.filter(gender='null').update(gender='男')
+        # Userprofile.objects.filter(realname='null').update(realname='')
+        # Userprofile.objects.filter(cardnum='null').update(cardnum='')
+        return JsonResponse({"code":1})