From 5ecc1e17bcbe0d83ff9efc1ef35f851a48cfc840 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Wed, 25 Jun 2025 18:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E7=89=88=E5=8F=8A?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../registrationDetail.html                   |   4 +-
 .../code/registration/registration.html       |  12 +-
 .../code/registration/staticRegistration.html |   7 +
 .../EnforcementRegistrationController.java    |  13 +-
 .../domain/EnforcementCheckStatistics.java    |   2 +
 .../dto/EnforcementRegistrationDto.java       |  13 ++
 .../impl/EnforcementCheckStatisticsImpl.java  | 164 ++++++++++--------
 .../EnforcementCheckStatisticsMapper.xml      |   2 +-
 .../mapper/EnforcementRegistrationMapper.xml  |   4 +-
 9 files changed, 131 insertions(+), 90 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html
index f6fcbd00..aaf20ad9 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html
@@ -98,7 +98,7 @@
                 },
                 {
                     field : 'qy',
-                    title : '企业所属区域'
+                    title : '企业注册地'
                 },
                 {
                     field : 'jd',
@@ -154,7 +154,7 @@
                 },
                 {
                     field : 'qy',
-                    title : '企业所属区域'
+                    title : '企业注册地'
                 },
                 {
                     field : 'jd',
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
index cdc3ea42..d6fba03f 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
@@ -30,7 +30,7 @@
                         <div class="select-list">
                             <ul>
                                 <li>
-                                    <p>执法单位/受委托组织：</p>
+                                    <p>执法单位：</p>
                                     <input type="text" name="bureauDeptName"/>
                                 </li>
                                 <li>
@@ -92,7 +92,7 @@
                                     </select>
                                 </li>
                                 <li>
-                                    <p>企业所属区域：</p>
+                                    <p>企业注册地：</p>
                                     <select id="qy" name="qy" th:with="type=${@dict.getType('address_type')}" onchange="addressMake()">
                                         <option value="">全市</option>
                                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -342,7 +342,7 @@
                     },
                     {
                         field : 'qy',
-                        title : '企业所属区域'
+                        title : '企业注册地'
                     },
                     {
                         field : 'jd',
@@ -350,7 +350,7 @@
                     },
                     {
                         field : 'bureauDeptName',
-                        title : '执法单位/受委托组织',
+                        title : '执法单位',
                         formatter:function (value,row,index) {
                             if(row.uniteType==1){
                                 return "<div style='text-align: left'>"+ value +"(牵头单位)</div>";
@@ -483,7 +483,7 @@
                     },
                     {
                         field : 'qy',
-                        title : '企业所属区域'
+                        title : '企业注册地'
                     },
                     {
                         field : 'jd',
@@ -491,7 +491,7 @@
                     },
                     {
                         field : 'bureauDeptName',
-                        title : '执法单位/受委托组织',
+                        title : '执法单位',
                         formatter:function (value,row,index) {
                             if(row.uniteType==1){
                                 return "<div style='text-align: left'>"+ value +"(牵头单位)</div>";
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
index d506c916..b0f41f3d 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
@@ -208,6 +208,13 @@
                             return "<div style='text-align: left'>"+ $.table.tooltip(value) +"</div>";
                         }
                     },
+                    {
+                        field : 'enforcementTime',
+                        title : '检查时间',
+                        formatter:function (value,row,index) {
+                            return "<div style='text-align: left'>"+ $.table.tooltip(value) +"</div>";
+                        }
+                    },
                     {
                         field : 'total',
                         title : '检查次数',
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
index 51e25ec1..3abca04d 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
@@ -725,7 +725,7 @@ public class EnforcementRegistrationController extends BaseController
         styleRow2.setBorderLeft(BorderStyle.THIN);
         styleRow2.setFont(font2);
         //设置表头
-        String[] headerList = {"区域", "街道", "企业名称","执法部门", "执法人员", "检查事项","检查次数", "2次及以下", "3至4次（黄色）", "5至6次（橙色）" ,"7次及以上（红色）"};
+        String[] headerList = {"区域", "街道", "企业名称","执法部门", "执法人员", "检查事项","检查时间","检查次数", "2次及以下", "3至4次（黄色）", "5至6次（橙色）" ,"7次及以上（红色）"};
         HSSFRow headerRow = sheet.createRow(0);
         for (int i = 0; i < headerList.length; i++) {
             HSSFCell cell = headerRow.createCell(i);
@@ -752,15 +752,16 @@ public class EnforcementRegistrationController extends BaseController
             }
             cell4.setCellValue(name);
             row.createCell(5).setCellValue(enforcementRegistrationDtos.get(i).getLawEnforcementItemText());
-            row.createCell(6).setCellValue(enforcementRegistrationDtos.get(i).getTotal());
+            row.createCell(6).setCellValue(enforcementRegistrationDtos.get(i).getEnforcementTime());
+            row.createCell(7).setCellValue(enforcementRegistrationDtos.get(i).getTotal());
             if(enforcementRegistrationDtos.get(i).getTotal()<=2){
-                row.createCell(7).setCellValue(enforcementRegistrationDtos.get(i).getTotal());
-            }else if(3<=enforcementRegistrationDtos.get(i).getTotal()&&enforcementRegistrationDtos.get(i).getTotal()<=4){
                 row.createCell(8).setCellValue(enforcementRegistrationDtos.get(i).getTotal());
-            }else if(5<=enforcementRegistrationDtos.get(i).getTotal()&&enforcementRegistrationDtos.get(i).getTotal()<=6){
+            }else if(3<=enforcementRegistrationDtos.get(i).getTotal()&&enforcementRegistrationDtos.get(i).getTotal()<=4){
                 row.createCell(9).setCellValue(enforcementRegistrationDtos.get(i).getTotal());
-            }else if(enforcementRegistrationDtos.get(i).getTotal()>=7) {
+            }else if(5<=enforcementRegistrationDtos.get(i).getTotal()&&enforcementRegistrationDtos.get(i).getTotal()<=6){
                 row.createCell(10).setCellValue(enforcementRegistrationDtos.get(i).getTotal());
+            }else if(enforcementRegistrationDtos.get(i).getTotal()>=7) {
+                row.createCell(11).setCellValue(enforcementRegistrationDtos.get(i).getTotal());
             }
         }
         httpServletResponse.setCharacterEncoding("UTF-8");
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java
index 594868d4..852b4903 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java
@@ -30,6 +30,8 @@ public class EnforcementCheckStatistics extends BaseDomain {
     /** 检查事项 */
     private String lawEnforcementItem;
     private String lawEnforcementItemText;
+    /** 执法时间 */
+    private String enforcementTime;
     /** 区域 */
     private String deptName;
     /** 备注 */
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java
index a7c33a7a..9bc7efed 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java
@@ -2,6 +2,8 @@ package com.zdxt.code.domain.dto;
 
 import com.zdxt.common.BaseDomain;
 
+import java.util.Date;
+
 /**
  * 执法登记 统计
  */
@@ -40,6 +42,9 @@ public class EnforcementRegistrationDto extends BaseDomain {
      */
     private String bureauDeptName;
 
+    /** 执法时间 */
+    private Date enforcementTime;
+
     /**
      * 年度
      */
@@ -201,4 +206,12 @@ public class EnforcementRegistrationDto extends BaseDomain {
     public void setEnterpriseAddress(String enterpriseAddress) {
         this.enterpriseAddress = enterpriseAddress;
     }
+
+    public Date getEnforcementTime() {
+        return enforcementTime;
+    }
+
+    public void setEnforcementTime(Date enforcementTime) {
+        this.enforcementTime = enforcementTime;
+    }
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java
index 00bf5ccf..aed182f1 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java
@@ -72,7 +72,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
             cell.setCellStyle(styleRow3);
         }
     }
-    private void setStyle1(int c1,String c2,String c3,String c4,String c5,String c6,long c7,long c8,long c9,long c10,long c11,String c12,HSSFRow row,HSSFCellStyle styleRow3){
+    private void setStyle1(int c1,String c2,String c3,String c4,String c5,String c6,String c7,long c8,long c9,long c10,long c11,long c12,String c13,HSSFRow row,HSSFCellStyle styleRow3){
         HSSFCell cell1= row.createCell(0);
         cell1.setCellValue(c1);
         cell1.setCellStyle(styleRow3);
@@ -91,11 +91,9 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         HSSFCell cell6= row.createCell(5);
         cell6.setCellValue(c6);
         cell6.setCellStyle(styleRow3);
-        HSSFCell cell7 = row.createCell(6);
+        HSSFCell cell7= row.createCell(6);
+        cell7.setCellValue(c7);
         cell7.setCellStyle(styleRow3);
-        if(c7!=0) {
-            cell7.setCellValue(c7);
-        }
         HSSFCell cell8 = row.createCell(7);
         cell8.setCellStyle(styleRow3);
         if(c8!=0) {
@@ -116,9 +114,14 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         if(c11!=0) {
             cell11.setCellValue(c11);
         }
-        HSSFCell cell12= row.createCell(11);
-        cell12.setCellValue(c12);
+        HSSFCell cell12 = row.createCell(11);
         cell12.setCellStyle(styleRow3);
+        if(c12!=0) {
+            cell12.setCellValue(c12);
+        }
+        HSSFCell cell13= row.createCell(12);
+        cell13.setCellValue(c13);
+        cell13.setCellStyle(styleRow3);
     }
     /**
      *为合并的单元格修正样式
@@ -375,17 +378,17 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         String strStart=sMonther.format(simpleDateFormat.parse(enforcementCheckStatistics.getStartTime()))+"月"+sDay.format(simpleDateFormat.parse(enforcementCheckStatistics.getStartTime()))+"日";
         String strEnd=sMonther.format(simpleDateFormat.parse(enforcementCheckStatistics.getEndTime()))+"月"+sDay.format(simpleDateFormat.parse(enforcementCheckStatistics.getEndTime()))+"日";
         String strNow=sYear.format(enforcementCheckStatistics.getNowTime())+"年"+sMonther.format(enforcementCheckStatistics.getNowTime())+"月"+sDay.format(enforcementCheckStatistics.getNowTime())+"日 "+enforcementCheckStatistics.getNowTime().getHours()+"时"+enforcementCheckStatistics.getNowTime().getMinutes()+"分";
-        cell1.setCellValue("行政执法检查统计\n(统计范围："+strStart+"至"+strEnd+"     统计时间："+strNow+"    企业赋码总数量："+enterpriseStreet.size()+"家)");
+        cell1.setCellValue("深圳市涉企行政检查登记情况\n(统计范围："+strStart+"至"+strEnd+"     统计时间："+strNow+")");
         //将单元格样式应用到该单元格
         cell1.setCellStyle(styleRow1);
         //合并单元格--CellRangeAddress(起始行，结束行，起始列，结束列)
-        sheet.addMergedRegion(new CellRangeAddress(0,0,0,11));
+        sheet.addMergedRegion(new CellRangeAddress(0,0,0,12));
         //在sheet里创建第二行
         HSSFRow row2=sheet.createRow(1);
 
         List<String> headRow2List=new ArrayList<>();
-        Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","检查事项","执法检查次数",
-                "2次及以下","3至4次\n(黄色)","5至6次\n(橙色)","7次及以上\n(红色)","备注");
+        Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","检查事项","检查时间","执法检查次数",
+                "2次及以下","3至4次","5至6次","7次及以上","备注");
         setStyle(headRow2List,row2,styleRow2);
         int rowNum=1;
         //遍历地区list
@@ -411,11 +414,11 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                         HSSFRow row = sheet.createRow(++rowNum);
                         List<String> cellList=new ArrayList<>();
                         Collections.addAll(cellList,""+(i+1),area,qyGroup2.get(k).get(0).getEnterpriseName(),qyGroup2.get(k).get(0).getBureauDeptName(),
-                                qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),"1",
+                                qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),qyGroup2.get(k).get(0).getEnforcementTime(),"1",
                                 "1","","","",qyGroup2.get(k).get(0).getRemark());
                         //setStyle(cellList,row,styleRow3);
                         setStyle1(i+1,area,qyGroup2.get(k).get(0).getEnterpriseName(),qyGroup2.get(k).get(0).getBureauDeptName(),
-                                qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),1,1,0,0,0,
+                                qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),qyGroup2.get(k).get(0).getEnforcementTime(),1,1,0,0,0,
                                 qyGroup2.get(k).get(0).getRemark(),row,styleRow3);
                     }else {
                         sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),2,2));//合并企业
@@ -440,31 +443,31 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                                 List<String> cellList=new ArrayList<>();
                                 if(qyGroup1.get(k)<3){
                                     Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1",
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
                                             ""+qyGroup1.get(k),"","","",zfGroup2.get(zf).get(0).getRemark());
                                     setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1,qyGroup1.get(k),
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,qyGroup1.get(k),
                                             0,0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
                                 } else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
                                     Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1",
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
                                             "",""+qyGroup1.get(k),"","",zfGroup2.get(zf).get(0).getRemark());
                                     setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1,
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
                                             0,qyGroup1.get(k),0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
                                 } else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
                                     Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1",
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
                                             "","",""+qyGroup1.get(k),"",zfGroup2.get(zf).get(0).getRemark());
                                     setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1,
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
                                             0,0,qyGroup1.get(k),0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
                                 }else {
                                     Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1",
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
                                             "","","",""+qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark());
                                     setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1,
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
                                             0,0,0,qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
                                 }
                                 //setStyle(cellList,row,styleRow3);
@@ -482,31 +485,31 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                                         List<String> cellList=new ArrayList<>();
                                         if(qyGroup1.get(k)<3){
                                             Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1",
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
                                                     ""+qyGroup1.get(k),"","","",ryGroup2.get(ry).get(0).getRemark());
                                             setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1,
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
                                                     qyGroup1.get(k),0,0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
                                         } else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
                                             Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1",
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
                                                     "",""+qyGroup1.get(k),"","",ryGroup2.get(ry).get(0).getRemark());
                                             setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1,
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
                                                     0,qyGroup1.get(k),0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
                                         } else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
                                             Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1",
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
                                                     "","",""+qyGroup1.get(k),"",ryGroup2.get(ry).get(0).getRemark());
                                             setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1,
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
                                                     0,0,qyGroup1.get(k),0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
                                         }else {
                                             Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1",
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
                                                     "","","",""+qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark());
                                             setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1,
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
                                                     0,0,0,qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
                                         }
                                         //setStyle(cellList,row,styleRow3);
@@ -523,31 +526,31 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                                             List<String> cellList=new ArrayList<>();
                                             if(qyGroup1.get(k)<3){
                                                 Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"",
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
                                                         ""+qyGroup1.get(k),"","","",sxGroup2.get(sx).get(0).getRemark());
                                                 setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx),
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
                                                         qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
                                             } else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
                                                 Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"",
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
                                                         "",""+qyGroup1.get(k),"","",sxGroup2.get(sx).get(0).getRemark());
                                                 setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx),
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
                                                         0,qyGroup1.get(k),0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
                                             } else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
                                                 Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"",
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
                                                         "","",""+qyGroup1.get(k),"",sxGroup2.get(sx).get(0).getRemark());
                                                 setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx),
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
                                                         0,0,qyGroup1.get(k),0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
                                             }else {
                                                 Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"",
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
                                                         "","","",""+qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark());
                                                 setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx),
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
                                                         0,0,0,qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
                                             }
                                             //setStyle(cellList,row,styleRow3);
@@ -571,7 +574,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                 rowNum++;
                 HSSFRow row=sheet.createRow(rowNum);
                 List<String> cellList=new ArrayList<>();
-                Collections.addAll(cellList,""+(i+1),area,"","","","","","","","","","");
+                Collections.addAll(cellList,""+(i+1),area,"","","","","","","","","","","");
                 setStyle(cellList,row,styleRow3);
             }
         }
@@ -2215,9 +2218,22 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         //建立新的sheet对象（sheet：表单）
         HSSFSheet sheet= wb.createSheet("行政执法检查统计");
         //自适应列宽
-        sheet.setDefaultColumnWidth(20);//全局
-        sheet.setColumnWidth(0,2500);//某列
-        sheet.setColumnWidth(1,2500);
+        sheet.setColumnWidth(0,1442);//某列
+        sheet.setColumnWidth(1,2256);
+        sheet.setColumnWidth(2,10970);
+        sheet.setColumnWidth(3,7288);
+        sheet.setColumnWidth(4,3482);
+        sheet.setColumnWidth(5,26906);
+        sheet.setColumnWidth(6,3727);
+        sheet.setColumnWidth(7,2586);
+        sheet.setColumnWidth(8,2586);
+        sheet.setColumnWidth(9,2586);
+        sheet.setColumnWidth(10,2586);
+        sheet.setColumnWidth(11,2586);
+        sheet.setColumnWidth(12,2586);
+//        sheet.setDefaultColumnWidth(20);//全局
+//        sheet.setColumnWidth(0,2500);//某列
+//        sheet.setColumnWidth(1,2500);
         //在sheet里创建第一行，参数为excel行数，0~65535
         HSSFRow row1=sheet.createRow(0);
         row1.setHeightInPoints(60);
@@ -2259,6 +2275,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         styleRow2.setFont(font2);
         //内容样式
         HSSFCellStyle styleRow3=wb.createCellStyle();
+        styleRow3.setWrapText(true);//换行
         styleRow3.setAlignment(HorizontalAlignment.CENTER);
         styleRow3.setVerticalAlignment(VerticalAlignment.CENTER);
         styleRow3.setBorderTop(BorderStyle.THIN);
@@ -2312,17 +2329,17 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
             System.out.println(localDate1.getMonth());
         }
         String strNow=sYear.format(enforcementCheckStatistics.getNowTime())+"年"+sMonther.format(enforcementCheckStatistics.getNowTime())+"月"+sDay.format(enforcementCheckStatistics.getNowTime())+"日 "+enforcementCheckStatistics.getNowTime().getHours()+"时"+enforcementCheckStatistics.getNowTime().getMinutes()+"分";
-        cell1.setCellValue("行政执法检查统计\n(统计范围："+strStart+"至"+strEnd+"     统计时间："+strNow+"    企业赋码总数量："+enterpriseStreet.size()+"家)");
+        cell1.setCellValue("深圳市涉企行政检查登记情况\n(统计范围："+strStart+"至"+strEnd+"     统计时间："+strNow+")");
         //将单元格样式应用到该单元格
         cell1.setCellStyle(styleRow1);
         //合并单元格--CellRangeAddress(起始行，结束行，起始列，结束列)
-        sheet.addMergedRegion(new CellRangeAddress(0,0,0,11));
+        sheet.addMergedRegion(new CellRangeAddress(0,0,0,12));
         //在sheet里创建第二行
         HSSFRow row2=sheet.createRow(1);
 
         List<String> headRow2List=new ArrayList<>();
-        Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","检查事项","执法检查次数",
-                "2次及以下","3至4次\n(黄色)","5至6次\n(橙色)","7次及以上\n(红色)","备注");
+        Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","检查事项","检查时间","执法检查次数",
+                "2次及以下","3至4次","5至6次","7次及以上","备注");
         setStyle(headRow2List,row2,styleRow2);
         int rowNum=1;
         //遍历地区list
@@ -2348,11 +2365,11 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                         HSSFRow row = sheet.createRow(++rowNum);
                         List<String> cellList=new ArrayList<>();
                         Collections.addAll(cellList,""+(i+1),area,qyGroup2.get(k).get(0).getEnterpriseName(),qyGroup2.get(k).get(0).getBureauDeptName(),
-                                qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),"1",
+                                qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),qyGroup2.get(k).get(0).getEnforcementTime(),"1",
                                 "1","","","",qyGroup2.get(k).get(0).getRemark());
                         //setStyle(cellList,row,styleRow3);
                         setStyle1(i+1,area,qyGroup2.get(k).get(0).getEnterpriseName(),qyGroup2.get(k).get(0).getBureauDeptName(),
-                                qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),1,1,0,0,0,
+                                qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),qyGroup2.get(k).get(0).getEnforcementTime(),1,1,0,0,0,
                                 qyGroup2.get(k).get(0).getRemark(),row,styleRow3);
                     }else {
                         sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),2,2));//合并企业
@@ -2377,31 +2394,31 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                                 List<String> cellList=new ArrayList<>();
                                 if(qyGroup1.get(k)<3){
                                     Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1",
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
                                             ""+qyGroup1.get(k),"","","",zfGroup2.get(zf).get(0).getRemark());
                                     setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1,qyGroup1.get(k),
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,qyGroup1.get(k),
                                             0,0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
                                 } else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
                                     Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1",
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
                                             "",""+qyGroup1.get(k),"","",zfGroup2.get(zf).get(0).getRemark());
                                     setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1,
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
                                             0,qyGroup1.get(k),0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
                                 } else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
                                     Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1",
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
                                             "","",""+qyGroup1.get(k),"",zfGroup2.get(zf).get(0).getRemark());
                                     setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1,
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
                                             0,0,qyGroup1.get(k),0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
                                 }else {
                                     Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1",
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
                                             "","","",""+qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark());
                                     setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
-                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1,
+                                            zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
                                             0,0,0,qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
                                 }
                                 //setStyle(cellList,row,styleRow3);
@@ -2419,31 +2436,31 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                                         List<String> cellList=new ArrayList<>();
                                         if(qyGroup1.get(k)<3){
                                             Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1",
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
                                                     ""+qyGroup1.get(k),"","","",ryGroup2.get(ry).get(0).getRemark());
                                             setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1,
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
                                                     qyGroup1.get(k),0,0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
                                         } else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
                                             Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1",
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
                                                     "",""+qyGroup1.get(k),"","",ryGroup2.get(ry).get(0).getRemark());
                                             setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1,
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
                                                     0,qyGroup1.get(k),0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
                                         } else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
                                             Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1",
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
                                                     "","",""+qyGroup1.get(k),"",ryGroup2.get(ry).get(0).getRemark());
                                             setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1,
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
                                                     0,0,qyGroup1.get(k),0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
                                         }else {
                                             Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1",
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
                                                     "","","",""+qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark());
                                             setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
-                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1,
+                                                    ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
                                                     0,0,0,qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
                                         }
                                         //setStyle(cellList,row,styleRow3);
@@ -2460,31 +2477,31 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                                             List<String> cellList=new ArrayList<>();
                                             if(qyGroup1.get(k)<3){
                                                 Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"",
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
                                                         ""+qyGroup1.get(k),"","","",sxGroup2.get(sx).get(0).getRemark());
                                                 setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx),
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(k).get(0).getEnforcementTime(),sxGroup1.get(sx),
                                                         qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
                                             } else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
                                                 Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"",
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
                                                         "",""+qyGroup1.get(k),"","",sxGroup2.get(sx).get(0).getRemark());
                                                 setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx),
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(k).get(0).getEnforcementTime(),sxGroup1.get(sx),
                                                         0,qyGroup1.get(k),0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
                                             } else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
                                                 Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"",
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
                                                         "","",""+qyGroup1.get(k),"",sxGroup2.get(sx).get(0).getRemark());
                                                 setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx),
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(k).get(0).getEnforcementTime(),sxGroup1.get(sx),
                                                         0,0,qyGroup1.get(k),0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
                                             }else {
                                                 Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"",
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
                                                         "","","",""+qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark());
                                                 setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
-                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx),
+                                                        sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(k).get(0).getEnforcementTime(),sxGroup1.get(sx),
                                                         0,0,0,qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
                                             }
                                             //setStyle(cellList,row,styleRow3);
@@ -2508,11 +2525,12 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                 rowNum++;
                 HSSFRow row=sheet.createRow(rowNum);
                 List<String> cellList=new ArrayList<>();
-                Collections.addAll(cellList,""+(i+1),area,"","","","","","","","","","");
+                Collections.addAll(cellList,""+(i+1),area,"","","","","","","","","","","");
                 setStyle(cellList,row,styleRow3);
             }
         }
-        String fileName="执法监督码"+strStart+"至"+strEnd+"使用情况.xls";
+        //表名：深圳市涉企行政检查登记情况（xxxx年xx月xx日至xxxx年xx月xx日）
+        String fileName="深圳市涉企行政检查登记情况("+strStart+"至"+strEnd+").xls";
         fileName = URLEncoder.encode(fileName, "UTF-8");
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/vnd.ms-excel");
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
index 0e7065fc..8c067063 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
@@ -48,7 +48,7 @@
     </select>
 
     <select id="selectAllStatisticsList" parameterType="EnforcementCheckStatistics" resultMap="EnforcementCheckStatisticsResult">
-            select e.bureau_dept_name,e.bureau_dept_id,e.law_enforcement_id,e.enterprise_number,i.enterprise_name,concat(e.law_enforcer,",",e.law_enforcer_two)as lawEnforcerTwo,e.law_enforcement_item_text,e.remark,i.enterprise_address
+            select e.bureau_dept_name,e.bureau_dept_id,e.law_enforcement_id,e.enterprise_number,i.enterprise_name,concat(e.law_enforcer,",",e.law_enforcer_two)as lawEnforcerTwo,e.law_enforcement_item_text,e.enforcement_time,e.remark,i.enterprise_address
             from enforcement_registration e
             left join sys_dept s on e.bureau_dept_id=s.dept_id
             left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on e.enterprise_number=i.enterprise_number
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 2c82785f..74cc2dbb 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -937,9 +937,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="staticEnforcementRegistrationLI" resultType="com.zdxt.code.domain.dto.EnforcementRegistrationDto" parameterType="EnforcementRegistrationDto">
         SELECT
-        enterprise_name,enterprise_number,bureau_dept_name,law_enforcer,law_enforcer_two,law_enforcement_item_text,enterprise_address,count( t.id ) AS total
+        enterprise_name,enterprise_number,bureau_dept_name,law_enforcer,law_enforcer_two,law_enforcement_item_text,enforcement_time,enterprise_address,count( t.id ) AS total
         FROM
-        ( SELECT r.id,r.enterprise_name,r.enterprise_number,r.bureau_dept_name,r.law_enforcer,r.law_enforcer_two,r.law_enforcement_item_text,r.create_time,i.enterprise_address from enforcement_registration r
+        ( SELECT r.id,r.enterprise_name,r.enterprise_number,r.bureau_dept_name,r.law_enforcer,r.law_enforcer_two,r.law_enforcement_item_text,r.enforcement_time,r.create_time,i.enterprise_address from enforcement_registration r
         left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number
         <where>
             and r.bureau_dept_name is not null