From f143c2b2864af604a25f4373b0fbc33c48288c61 Mon Sep 17 00:00:00 2001
From: Chendy <596813911@qq.com>
Date: Thu, 11 Sep 2025 17:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code/registration/registration.html       | 13 -------
 .../EnforcementRegistrationServiceImpl.java   | 36 +++++++++----------
 2 files changed, 18 insertions(+), 31 deletions(-)

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 32b5d4ba..4c23031c 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
@@ -169,7 +169,6 @@
                                     <li id="a" th:fragment="a">
                                         <p><span id="timeString"></span></p>
                                         <p><label th:text="涉企执法总数"></label><b th:text="${total}"></b></p>
-                                        <p><label th:text="联合执法"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p>
                                         <p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
                                     </li>
                                 </ul>
@@ -397,18 +396,6 @@
                         field : 'enforcementTime',
                         title : '执法时间'
                     },
-                    {
-                        field : 'uniteCheck',
-                        title : '联合执法',
-                        formatter:function (value,row,index) {
-                            if(value !=null && value!=''){
-                                /*return "<span>是</span>";*/
-                                return '<span style="cursor: pointer;color: blue;" ONCLICK="selectUnite(\'' + index + '\')">'+'是'+'</span>';
-                            }else{
-                                return "<span>否</span>";
-                            }
-                        }
-                    },
                     {
                         field : 'uniteCheck',
                         title : '受委托',
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
index a2928a2d..62d88f4d 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
@@ -889,7 +889,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         styleRow2.setBorderLeft(BorderStyle.THIN);
         styleRow2.setFont(font2);
         //设置表头
-        String[] headerList = {"被执法企业名称","企业所属区域", "企业所属街道", "执法单位", "执法人员","执法事项","执法时间","联合执法","行政执法类别","任务来源","是否扫码","未扫码原因","是否投诉"};
+        String[] headerList = {"被执法企业名称","企业所属区域", "企业所属街道", "执法单位", "执法人员","执法事项","执法时间","行政执法类别","任务来源","是否扫码","未扫码原因","是否投诉"};
         HSSFRow headerRow = sheet.createRow(0);
         for (int i = 0; i < headerList.length; i++) {
             HSSFCell cell = headerRow.createCell(i);
@@ -929,35 +929,35 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
             cell12.setCellValue(e.getCreateTime());
             cell12.setCellStyle(dateStyle);
 
+//            HSSFCell cell7 = row.createCell(7);
+//            if(e.getUniteCheck()!=null&&!"".equals(e.getUniteCheck())){
+//                cell7.setCellValue("是");
+//            }else {
+//                cell7.setCellValue("否");
+//            }
             HSSFCell cell7 = row.createCell(7);
-            if(e.getUniteCheck()!=null&&!"".equals(e.getUniteCheck())){
-                cell7.setCellValue("是");
-            }else {
-                cell7.setCellValue("否");
-            }
-            HSSFCell cell8 = row.createCell(8);
             if(lawMap.containsKey(e.getLawEnforceCategory())){
-                cell8.setCellValue(lawMap.get(e.getLawEnforceCategory()).getDictLabel());
+                cell7.setCellValue(lawMap.get(e.getLawEnforceCategory()).getDictLabel());
             }
-            HSSFCell cell9 = row.createCell(9);
+            HSSFCell cell8 = row.createCell(8);
             if(dictDataMap1.containsKey(e.getCheckCategory())){
-                cell9.setCellValue(dictDataMap1.get(e.getCheckCategory()).getDictLabel());
+                cell8.setCellValue(dictDataMap1.get(e.getCheckCategory()).getDictLabel());
             }
-            HSSFCell cell10 = row.createCell(10);
+            HSSFCell cell9 = row.createCell(9);
             if(e.getCheckCss()!=null&&!"".equals(e.getCheckCss())){
-                cell10.setCellValue("否");
+                cell9.setCellValue("否");
             }else {
-                cell10.setCellValue("是");
+                cell9.setCellValue("是");
             }
-            HSSFCell cell11 = row.createCell(11);
+            HSSFCell cell10 = row.createCell(10);
             if(dictDataMap2.containsKey(e.getCheckCss())){
-                cell11.setCellValue(dictDataMap2.get(e.getCheckCss()).getDictLabel());
+                cell10.setCellValue(dictDataMap2.get(e.getCheckCss()).getDictLabel());
             }
-            HSSFCell cell13 = row.createCell(12);
+            HSSFCell cell11 = row.createCell(11);
             if(e.getIsComplaint()==0){
-                cell13.setCellValue("否");
+                cell11.setCellValue("否");
             }else {
-                cell13.setCellValue("是");
+                cell11.setCellValue("是");
             }
 
         }