增加检查结束时间

safesite/models.py

@@ -899,7 +899,7 @@ class Trainuser(models.Model):  # 培训人员记录
     checked = models.IntegerField(default=0)
     qdsj = models.DateTimeField(null=True, blank=True)
     jsqd = models.DateTimeField(verbose_name='结束签到时间',null=True,blank=True)
-    isnew = models.IntegerField(default=0)
+    isnew = models.IntegerField(default=0, verbose_name='是否新参加')
     opinion = models.TextField('建议想法', null=True, blank=True)
     score = models.IntegerField('评价总体打分', null=True, blank=True)
 
@@ -1381,7 +1381,8 @@ class Checkjob(models.Model):
     checkname=models.ForeignKey(User,related_name='jianchas',on_delete=models.CASCADE)#检查人员
     checkquestion=models.TextField(null=True)#检查发现的问题
     zgtime=models.DateTimeField(null=True, blank=True)#整改时间
-    jctime=models.DateTimeField(null=True, blank=True)#检查时间
+    jctime=models.DateTimeField(null=True, blank=True)#检查开始时间
+    jctim2 = models.DateTimeField('检查结束时间', null=True, blank=True)
     zguser=models.ForeignKey(User,on_delete=models.CASCADE,null=True,)#整改人
     createuser = models.ForeignKey(User,related_name='chuangjian',on_delete=models.CASCADE,null=True)#创建人
     createdate = models.DateTimeField(default = timezone.now)#创建时间

safesite/templates/checkjobadd.html

@@ -31,13 +31,19 @@
                     </td>
                 </tr>
                 <tr>
-                    <td>检查时间：</td>
+                    <td>检查开始：</td>
                     <td>
                         <input id="jctime" editable="false" name="jctime" class="easyui-datetimebox" style="width:480px"
                                data-options="currentText:'今天',closeText:'关闭',showSeconds:false" required=true/>
                     </td>
                 </tr>
-
+                <tr>
+                    <td>检查结束：</td>
+                    <td>
+                        <input id="jctime2" editable="false" name="jctime2" class="easyui-datetimebox" style="width:480px"
+                               data-options="currentText:'今天',closeText:'关闭',showSeconds:false" required=true/>
+                    </td>
+                </tr>
 
 
                 <tr>

safesite/views.py

@@ -8721,8 +8721,9 @@ def checkprojects(req):
          obj.taskstate =int(data['taskstate'])
          obj.createuser = User.objects.get(userid=userid)
          obj.content=data['content']
-         obj.jctime=datetime.now()
-         obj.zgtime=datetime.now()
+         obj.jctime = datetime.now()
+         obj.jctim2 = data['jctime2']
+         obj.zgtime = datetime.now()
          if yhtp:
              obj.yhtp=yhtp
          obj.zghtp=zghtp