From 82c123ba76f9a3b56965293aa8c67c53a4a7cf9f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Sat, 4 Sep 2021 22:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A3=80=E6=9F=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=AF=A6=E6=83=85word?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/export.py                     |  28 ++++++++++-
 safesite/exportemp/checkjob.xlsx       | Bin 0 -> 9369 bytes
 safesite/models.py                     |  16 ++++++-
 safesite/templates/checkjob.html       |   3 +-
 safesite/templates/checkjobdetail.html |   6 ++-
 safesite/templates/checklistadd.html   |   6 +--
 safesite/views.py                      |  62 ++++++++++++++++++++++++-
 7 files changed, 112 insertions(+), 9 deletions(-)
 create mode 100644 safesite/exportemp/checkjob.xlsx

diff --git a/safesite/export.py b/safesite/export.py
index fe294ec4..15f93f08 100644
--- a/safesite/export.py
+++ b/safesite/export.py
@@ -2,7 +2,7 @@ from docxtpl import DocxTemplate, InlineImage
 from docx.shared import Mm, Inches, Pt
 from openpyxl import Workbook, load_workbook
 from openpyxl.drawing.image import Image
-from .models import User,Trouble,Dickey,Partment,Dicclass,Train,Drill,TroubleAccess,Group,Yjyc,ExamPaper,ExamPaperDetail,Question,Operation,Operzyry,Operspxq,Fxcs,Suggest,Suggestflow,Trainuser,Miss
+from .models import Checkjob, User,Trouble,Dickey,Partment,Dicclass,Train,Drill,TroubleAccess,Group,Yjyc,ExamPaper,ExamPaperDetail,Question,Operation,Operzyry,Operspxq,Fxcs,Suggest,Suggestflow,Trainuser,Miss
 from datetime import datetime,date
 import base64
 import os
@@ -735,6 +735,32 @@ def exportxlsx(a,objs,pic=1):
         res['Content-Disposition'] = 'attachment;filename='+filename+'.xlsx'
         res.write(output.getvalue())
         return res
+    elif a == 'chekjob':
+        #查询数据
+        wb = load_workbook(dirname + 'safesite/exportemp/checkjob.xlsx')
+        sheet = wb.active
+        for i, x in enumerate(objs):
+            num = str(i+3)
+            sheet['a'+num] = x.num
+            sheet['b'+num] = x.name
+            if x.cate:
+               sheet['c'+num] = x.cate.dickeyname
+            sheet['d'+num] = x.type
+            if x.area:
+               sheet['e'+num] = x.area.name
+            sheet['f'+num] = '正常' if x.state==1 else '异常'
+            sheet['g'+num] = 'https://safeyun.ctcshe.com/miniprogram/equipment?id='+str(x.id)
+
+        #开始生成excel
+        sheet['b1'] = datetime.now().strftime('%Y%m%d%H%M%S') 
+        filename = '安全检查整改记录'
+        output = BytesIO()
+        wb.save(output)
+        output.seek(0)
+        res = HttpResponse(content_type='application/vnd.ms-excel')
+        res['Content-Disposition'] = 'attachment;filename='+filename+'.xlsx'
+        res.write(output.getvalue())
+        return res
 
 def exportyjdoc(vl):
     doc = DocxTemplate(dirname + "safesite/exportemp/fxbg.docx")
diff --git a/safesite/exportemp/checkjob.xlsx b/safesite/exportemp/checkjob.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..01755d330c1a085f489930ba3e668a97268fcb0a
GIT binary patch
literal 9369
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

literal 0
HcmV?d00001

diff --git a/safesite/models.py b/safesite/models.py
index 846c877d..0cbfc044 100644
--- a/safesite/models.py
+++ b/safesite/models.py
@@ -1360,6 +1360,14 @@ class Checktable(models.Model):
 
 #检查任务
 class Checktask(models.Model):
+    tasktype_choice = (
+        (1, '每天一次'),
+        (2, '每周一次'),
+        (3, '每月一次'),
+        (4, '每季度一次'),
+        (5, '每半年一次'),
+        (6, '每年一次'),
+    )
     id=models.AutoField(primary_key=True)#主键
     checktaskname=models.CharField(max_length=300)#任务名
     checktype=models.ForeignKey(Checktable,on_delete=models.CASCADE)#关联检查表
@@ -1370,12 +1378,18 @@ class Checktask(models.Model):
     createdate = models.DateTimeField(default = timezone.now)#创建时间
     usecomp = models.ForeignKey(Partment,related_name='taskscomp',on_delete=models.CASCADE,null=True,blank=True)#创建公司
     deletemark = models.IntegerField(default=1)#是否删除
-    tasktype = models.IntegerField(default=0)#任务执行频率（1每天，2每周，3每月，4每季度，5每半年，6每年）
+    tasktype = models.IntegerField(default=1, choices=tasktype_choice)#任务执行频率（1每天，2每周，3每月，4每季度，5每半年，6每年）
     userlist = models.TextField(default='')#检查人列表
     zxstate = models.IntegerField(default=1)#1同时执行，2一个执行就执行
     taskstate = models.IntegerField(default=1)#是否暂停，1运行，2暂停
     
 class Checkjob(models.Model):
+    taskstate_choice = (
+        (1, '正在整改中'),
+        (2, '已整改完成'),
+        (3, '任务关闭'),
+        (4, '待执行')
+    )
     id=models.AutoField(primary_key=True)#主键
     checktask=models.ForeignKey(Checktask,on_delete=models.CASCADE)#关联任务表
     checkname=models.ForeignKey(User,related_name='jianchas',on_delete=models.CASCADE)#检查人员
diff --git a/safesite/templates/checkjob.html b/safesite/templates/checkjob.html
index 87726acc..851b4aa0 100644
--- a/safesite/templates/checkjob.html
+++ b/safesite/templates/checkjob.html
@@ -138,7 +138,6 @@
         });
     function yhsearch() {
         var querydata = $('#searchyhff').serializeJSON();
-        querydata['a'] = 'listsearch'
         $('#sdg_job').dialog('close')
         $('#jobtab').datagrid('load', querydata);
 
@@ -146,7 +145,7 @@
     function reset() {
         $('#searchyhff').form('clear')
         $('#jobtab').datagrid('options').queryParams = {
-            a:'listall'
+            a:'listall4'
         }
         $('#jobtab').datagrid('load');
 
diff --git a/safesite/templates/checkjobdetail.html b/safesite/templates/checkjobdetail.html
index 589804fe..04772827 100644
--- a/safesite/templates/checkjobdetail.html
+++ b/safesite/templates/checkjobdetail.html
@@ -6,8 +6,9 @@
         <a id="yanshou" onclick="yanshou()" class="easyui-linkbutton" data-options="iconCls: 'fa-download'">验收</a>
         {{/if}}
         <a iconCls="fa-close" class="easyui-linkbutton" onclick="closeForm()">关闭</a>
+        <a iconCls="fa-download" class="easyui-linkbutton" onclick="exportcheckjobword()" data-options="{ iconCls: 'fa-download'}">导出</a>
     </div>
-    <div data-options="region:'center'" style="height:100%;padding:15px 15px;">
+    <div data-options="region:'center'" style="height:100%;padding:15px 15px;" id="checkjobdiv">
         <div style="text-align:center;font-size: 24px;font-weight: bold;margin-bottom: 20px;">{{checktask__checktaskname}}</div>
         <table class='detailtable' style="text-align:center;">
             <tr>
@@ -211,4 +212,7 @@
         }
     });
     }
+    function exportcheckjobword(e) {
+        $("#checkjobdiv").wordExport('安全检查整改记录');
+    }
 </script>
\ No newline at end of file
diff --git a/safesite/templates/checklistadd.html b/safesite/templates/checklistadd.html
index 2a09256a..d25d2149 100644
--- a/safesite/templates/checklistadd.html
+++ b/safesite/templates/checklistadd.html
@@ -36,9 +36,9 @@
                        data-options="label:'初次检查',currentText:'今天',closeText:'关闭',showSeconds:false" required=true />
             </div>
             <div style="margin-bottom:5px">
-                <input id="checktabtitle" class="easyui-textbox" name="checktabtitle" style="        width: 480px;
+                <input id="checktabtitlex" class="easyui-textbox" name="checktabtitle" style="        width: 480px;
         height: 40px
-" data-options="label:'检查项目'" required=true />
+" data-options="label:'检查表'" required=true />
             </div>
             <div style="margin-top:10px;margin-bottom:5px">
                 <input id="checkplace" class="easyui-textbox" name="checkplace" style="        width: 480px;
@@ -55,7 +55,7 @@
    
     
     $(function () {
-        $("#checktabtitle").combobox({
+        $("#checktabtitlex").combobox({
         url: 'api/checkproject?a=checktablist',
         valueField: 'value',
         textField: 'text',
diff --git a/safesite/views.py b/safesite/views.py
index 30101abc..1bffdbaf 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -8659,6 +8659,9 @@ def checkprojects(req):
         
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif a == 'listall3':
+        """
+        任务分配列表
+        """
         startnum,endnum = fenye(req)
         a = Checktask.objects.filter(usecomp=Partment.objects.get(partid=companyid), deletemark=1).order_by('-createdate')
         total = a.count()
@@ -8668,8 +8671,27 @@ def checkprojects(req):
        
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif a == 'listall4':
+        """
+        检查工作列表
+        """
         startnum,endnum = fenye(req)
-        a = Checkjob.objects.filter(usecomp=Partment.objects.get(partid=companyid),checkname__userid=userid,deletemark=1).order_by('-starttime')
+        a = Checkjob.objects.filter(usecomp=Partment.objects.get(
+            partid=companyid)).exclude(deletemark=0)
+        qssj = req.GET.get('qssj')#开始时间
+        jssj = req.GET.get('jssj')#结束时间
+        checktabtitle = req.GET.get('checktabtitle')#检查表名
+        checktaskname = req.GET.get('checktaskname')#任务名称
+        checkername = req.GET.get('checkername', None)
+        if qssj:
+            a = a.filter(starttime__gte=qssj)
+        if jssj:
+            a = a.filter(starttime__lte=jssj)
+        if checktabtitle:
+            a = a.filter(checktask__checktype__id=checktabtitle)
+        if checktaskname:
+            a = a.filter(checktask__id=checktaskname)
+        if checkername:
+            a = a.filter(checkname__name=checkername)
         total = a.count()
         startnum, endnum = fenye(req)
         
@@ -9041,6 +9063,44 @@ def checkprojects(req):
         return HttpResponse(transjson(total, a), content_type="application/json")
 
 
+def apicheckjob(req):
+    a = req.GET.get('a')
+    userid = req.session['userid']
+    companyid = getcompany(userid)
+    if a == 'exportexcel':
+        """
+        检查工作列表导出
+        """
+        objs = Checkjob.objects.filter(usecomp=Partment.objects.get(
+            partid=companyid)).exclude(deletemark=0)
+        qssj = req.GET.get('qssj', None)#开始时间
+        jssj = req.GET.get('jssj', None)#结束时间
+        checktabtitle = req.GET.get('checktabtitle', None)#检查表名
+        checktaskname = req.GET.get('checktaskname', None)#任务名称
+        checkername = req.GET.get('checkername', None)
+        if qssj:
+            objs = objs.filter(starttime__gte=qssj)
+        if jssj:
+            objs = objs.filter(starttime__lte=jssj)
+        if checktabtitle:
+            objs = objs.filter(checktask__checktype__id=checktabtitle)
+        if checktaskname:
+            objs = objs.filter(checktask__id=checktaskname)
+        if checkername:
+            objs = objs.filter(checkname__name=checkername)
+        total = objs.count()
+        if total > 200:
+            res = HttpResponse()
+            res.write('数量超过200,请筛选后导出!')
+            return res
+        objs = objs.order_by('-starttime').values('id','checktask__checktaskname','jobstate',
+        'starttime','endtime','yanshou','checkquestion','zguser__username','zgtime','yanshouren__name'
+        'checktask__checktype__checktitle','checkname__username','checkname__name', 
+        'taskstate','checktask__checktime','createuser__username','createdate', 'taskstate__display', 'checktask__tasktype__display')
+        # res = exportxlsx('checkjob', objs)
+        # return res
+
+
 
 @apicheck_login
 def apioffence(req):