From d73b9d7e5068c737f18d91e9b80e904fe88e9373 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Thu, 14 Nov 2024 18:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9+=E6=89=A7?=
 =?UTF-8?q?=E6=B3=95=E6=A3=80=E6=9F=A5=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code/complaintStatic/complaintStatic.html |  10 +-
 .../code/registration/registration.html       |  86 +++-----
 .../code/registration/staticRegistration.html |   1 +
 .../EnforcementRegistrationController.java    |  13 +-
 .../IEnforcementRegistrationService.java      |   3 +
 .../impl/EnforcementCheckStatisticsImpl.java  |   2 +-
 .../EnforcementRegistrationServiceImpl.java   | 188 ++++++++++++++++++
 .../mapper/EnterpriseStreetMapper.xml         |   1 +
 .../resources/mapper/Zfryjdm2405301Mapper.xml |  23 ++-
 9 files changed, 251 insertions(+), 76 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
index 7f0d7c65..95c8acbd 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
@@ -95,7 +95,7 @@
                             <li>
                                 <a class="btn btn-success btn-sm" onclick="searchComplaint1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-reset btn-sm" onclick="complaintRest(1)"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-warning btn-sm" onclick="complaintDownload1()"><i class="fa fa-share-square-o"></i> 导出</a>
+                                <a class="btn btn-warning btn-sm" onclick="complaintDownload()"><i class="fa fa-share-square-o"></i> 导出</a>
                             </li>
                         </ul>
                         <div class="static-content">
@@ -159,7 +159,7 @@
                             <li>
                                 <a class="btn btn-success btn-sm" onclick="searchComplaint('form',2)"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-reset btn-sm" onclick="complaintRest(2)"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-share-square-o"></i> 导出</a>
+                                <a class="btn btn-warning btn-sm" onclick="downloadC2()"><i class="fa fa-share-square-o"></i> 导出</a>
                             </li>
                         </ul>
                         <!--<ul>
@@ -596,9 +596,9 @@
         function openPicture(url){
             debugger
             if(url!=null&&url!=''){
-                this.$message.warning('图片不存在');
-            }else{
                 window.open(url);
+            }else{
+                this.$message.warning('图片不存在');
             }
         }
         function closeC(){
@@ -630,7 +630,7 @@
             var currentId=$('form').eq(1).attr('id')
             var params = $.common.formToJSON(currentId);
             $.ajax({
-                url:ctx+"/enforcementCheckStatistics/queryList/2024/9",
+                url:ctx+"/enforcementCheckStatistics/queryAllList/2024-11-14/2024-11-14",
                 type:'GET',
                 success: function (response) {
                 }
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 274224ee..f3643488 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
@@ -138,7 +138,7 @@
                                 <li>
                                     <a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                     <a class="btn btn-reset btn-sm" onclick="rest1()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                    <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-share-square-o"></i> 导出</a>
+                                    <a class="btn btn-warning btn-sm" onclick="downloadR()"><i class="fa fa-share-square-o"></i> 导出</a>
                                 </li>
                             </ul>
                             <div class="static-content">
@@ -276,6 +276,7 @@
         var currentQuarter=quarterMake(currentMonth);
         //console.log(uniteNumber);
         //console.log(checkCategory);
+        var data1=[];
         window.onload = function () {
             $("#quarter").hide();
             $("#month").hide();
@@ -1113,6 +1114,8 @@
                 data:params,
                 success:function (response){
                     $('#bootstrap-table').bootstrapTable('load', response);
+                    data1=response;
+                    console.log(data1);
                 },error:function (xhr,status,error){
                     console.error("请求失败：",status,error);
                 }
@@ -1158,64 +1161,6 @@
             document.getElementById(`${prefix}${num}`).classList.add('actit');
             document.getElementById(`${prefix}-tab${num}`).classList.add('active');
         }
-        function download1(){
-            /*startTime=searchType.beginTime;
-            endTime=searchType.endTime;*/
-            /*$.ajax({
-                url:ctx+"enforcementCheckStatistics/queryAllList/"+startTime+"/"+endTime,
-                type:'GET',
-                success: function (data) {
-                    console.log('329'+data)
-                }
-            })*/
-            /*this.download('/export',{
-                ...this.queryParameters
-            },`registration.xlsx`)*/
-            //$.operate.get(ctx+"enforcementCheckStatistics/queryAllList", { "startTime": searchType.beginTime, "endTime": searchType.endTime });
-            let table=document.getElementById('bootstrap-table');
-            //let html=table.outerHTML;
-            let newTableHtml='<table><thead><tr>';
-            let headers = table.querySelectorAll('thead tr th');
-            headers.forEach((header, index) => {
-                console.log(header,index);
-                console.log(index !== 9);
-                if (index !== 9) {
-                    newTableHtml += `<th>${header.innerText}</th>`;
-                }
-            });
-            newTableHtml += '</tr></thead><tbody>';
-            let rows = table.querySelectorAll('tbody tr');
-            rows.forEach(row => {
-                newTableHtml += '<tr>';
-                let cells = row.querySelectorAll('td');
-                cells.forEach((cell, index) => {
-                    if (index !== 9) {
-                        newTableHtml += `<td>${cell.innerText}</td>`;
-                    }
-                });
-                newTableHtml += '</tr>';
-            });
-            newTableHtml += '</tbody></table>';
-            let downloadLink=document.createElement("a");
-            //document.body.append(downloadLink);
-            downloadLink.href='data:application/vnd.ms-excel,'+ encodeURIComponent(newTableHtml);
-            document.body.appendChild(downloadLink);
-            downloadLink.download='执法检查统计.xls';
-            downloadLink.click();
-            document.body.removeChild(downloadLink);
-        }
-        /*var table=document.getElementById('bootstrap-table');
-        var rows=table.rows;
-        var data1=[];
-        for(var i=0;i<rows.length;i++){
-            var rowData=[];
-            for(var j=0;j<rows[i].cells.length;j++){
-                rowData.push(rows[i].cells[j].innerText);
-            }
-            data1.push(rowData)
-        }
-        var encodedUri=encodeURI(csvContent);
-        var link=do*/
         function quarterMake(month){
             let quarter=Math.ceil(month/3);
             if(quarter==1){
@@ -1260,7 +1205,28 @@
         function closeUnite(){
             $('#detail2').hide();
         }
-
+        function downloadR(){
+            var currentId=$('form').eq(0).attr('id');
+            var params = $.common.formToJSON(currentId);
+            $.ajax({
+                type: "POST",
+                data: JSON.stringify(params),
+                contentType: 'application/json',
+                //设置响应类型
+                xhrFields: {responseType: "blob"},
+                url: prefix+"/exportUser",
+                success: function (result) {
+                    const link = document.createElement('a');
+                    let blob = new Blob([result], {type: 'application/vnd.ms-excel'});
+                    link.style.display = 'none';
+                    link.href = URL.createObjectURL(blob);
+                    link.setAttribute('download', "执法检查统计.xls");
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link)
+                }
+            })
+        }
         /*******2.年度计划TOP10********/
 
         /*var myChart = echarts.init(document.getElementById('echarts2'));
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 e751b921..81b73fa8 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
@@ -156,6 +156,7 @@
                 showToggle: false,
                 pagination: true,
                 pageSize: 10,
+                pageList: [10, 25, 50],
                 columns: [
                     {
                         field : 'qy',
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 1995fbe1..43f3dab0 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
@@ -1,5 +1,6 @@
 package com.zdxt.code.controller;
 
+import java.io.IOException;
 import java.lang.reflect.Array;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
@@ -299,7 +300,11 @@ public class EnforcementRegistrationController extends BaseController
             enforcementRegistration.setQy(iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy()));
         }
         DecimalFormat str1=new DecimalFormat("0.00%");
-        model.addAttribute("year",enforcementRegistration.getYear());
+        if(enforcementRegistration.getYear()==null||"".equals(enforcementRegistration.getYear())) {
+            model.addAttribute("year","-");
+        }else {
+            model.addAttribute("year", enforcementRegistration.getYear());
+        }
         List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
         System.out.println(1);
         List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList());
@@ -640,4 +645,10 @@ public class EnforcementRegistrationController extends BaseController
         }
         return yearList;
     }
+
+    @PostMapping("/exportUser")
+    @ResponseBody
+    public void exportRegistration(HttpServletResponse httpServletResponse,@RequestBody EnforcementRegistration enforcementRegistration) throws IOException {
+        enforcementRegistrationService.exportRegistration(httpServletResponse,enforcementRegistration);
+    }
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
index e0c9f0de..d0981787 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
@@ -5,6 +5,8 @@ import com.zdxt.code.domain.EnforcementRegistration;
 import com.zdxt.code.domain.dto.EnforcementRegistrationDto;
 import com.zdxt.common.zdxtFile.AttFileRespDTO;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -108,4 +110,5 @@ public interface IEnforcementRegistrationService
      */
     List<EnforcementRegistrationDto> staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto);
 
+    void exportRegistration(HttpServletResponse response,EnforcementRegistration enforcementRegistration) throws IOException;
 }
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 5866e6a7..e53c9364 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
@@ -373,7 +373,7 @@ 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+"    企业赋码总数量："+enterpriseStreet.size()+"家)");
         //将单元格样式应用到该单元格
         cell1.setCellStyle(styleRow1);
         //合并单元格--CellRangeAddress(起始行，结束行，起始列，结束列)
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 6ad581d9..77448022 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
@@ -1,9 +1,11 @@
 package com.zdxt.code.service.impl;
 
+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.bean.BeanUtil;
@@ -26,10 +28,14 @@ import com.zdxt.common.zdxtFile.AttFileRespDTO;
 import com.zdxt.common.zdxtFile.FilePreviewUtilBean;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
 import com.zdxt.domain.auth.DictData;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.CellType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnforcementRegistrationMapper;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 执法端-执法登记Service业务层处理
  * 
@@ -724,4 +730,186 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         }
         return false;
     }
+    @Override
+    public void exportRegistration(HttpServletResponse response,EnforcementRegistration enforcementRegistration) throws IOException {
+        List<EnforcementRegistration> enforcementRegistrationList=enforcementRegistrationListToExport(enforcementRegistration);
+        List<DictData> dictDataList1=iDictDataService.selectDictDataByType("check_category");
+        Map<String,DictData> dictDataMap1=dictDataList1.stream().collect(Collectors.toMap(DictData::getDictValue, Function.identity()));
+        List<DictData> dictDataList2=iDictDataService.selectDictDataByType("no-scan-reason");
+        Map<String,DictData> dictDataMap2=dictDataList2.stream().collect(Collectors.toMap(DictData::getDictValue, Function.identity()));
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        HSSFSheet sheet = workbook.createSheet("执法检查统计");
+        //设置文件名称
+        String fileName = "员工信息" + LocalDate.now() + ".xls";
+        //设置表头
+        String[] headerList = {"区域", "街道", "执法部门", "执法人员","企业名称","检查事项","联合检查","行政检查类别","是否扫码","未扫码原因","是否投诉","检查时间"};
+        HSSFRow headerRow = sheet.createRow(0);
+        for (int i = 0; i < headerList.length; i++) {
+            HSSFCell cell = headerRow.createCell(i);
+            HSSFRichTextString text = new HSSFRichTextString(headerList[i]);
+            cell.setCellValue(text);
+        }
+        HSSFCellStyle dateStyle= workbook.createCellStyle();
+        HSSFDataFormat cellDataFormat= workbook.createDataFormat();;
+        dateStyle.setDataFormat(cellDataFormat.getFormat("yyyy\"年\"m\"月\"d\"日\" h:mm:ss"));
+        for(int i=0;i<enforcementRegistrationList.size();i++){
+            EnforcementRegistration e=enforcementRegistrationList.get(i);
+            HSSFRow row = sheet.createRow(i+1);
+            HSSFCell cell1 = row.createCell(0);
+            cell1.setCellValue(e.getQy());
+            HSSFCell cell2 = row.createCell(1);
+            cell2.setCellValue(e.getJd());
+            HSSFCell cell3 = row.createCell(2);
+            cell3.setCellValue(e.getBureauDeptName());
+            HSSFCell cell4 = row.createCell(3);
+            String name="";
+            if(!"".equals(e.getLawEnforcer())&&e.getLawEnforcer()!=null){
+                name=e.getLawEnforcer();
+            }
+            if(!"".equals(e.getLawEnforcer())&&e.getLawEnforcer()!=null&&!"".equals(e.getLawEnforcerTwo())&&e.getLawEnforcerTwo()!=null){
+                name=name+",";
+            }
+            if(!"".equals(e.getLawEnforcerTwo())&&e.getLawEnforcerTwo()!=null){
+                name=name+e.getLawEnforcerTwo();
+            }
+            cell4.setCellValue(name);
+            HSSFCell cell5 = row.createCell(4);
+            cell5.setCellValue(e.getEnterpriseName());
+            HSSFCell cell6 = row.createCell(5);
+            cell6.setCellValue(e.getLawEnforcementItemText());
+            HSSFCell cell7 = row.createCell(6);
+            if(e.getUniteCheck()!=null&&!"".equals(e.getUniteCheck())){
+                cell7.setCellValue("是");
+            }else {
+                cell7.setCellValue("否");
+            }
+            HSSFCell cell8 = row.createCell(7);
+            if(dictDataMap1.containsKey(e.getCheckCategory())){
+                cell8.setCellValue(dictDataMap1.get(e.getCheckCategory()).getDictLabel());
+            }
+            HSSFCell cell9 = row.createCell(8);
+            if(e.getCheckCss()!=null&&!"".equals(e.getCheckCss())){
+                cell9.setCellValue("否");
+            }else {
+                cell9.setCellValue("是");
+            }
+            HSSFCell cell10 = row.createCell(9);
+            if(dictDataMap2.containsKey(e.getCheckCss())){
+                cell10.setCellValue(dictDataMap2.get(e.getCheckCss()).getDictLabel());
+            }
+            HSSFCell cell11 = row.createCell(10);
+            if(e.getIsComplaint()==0){
+                cell11.setCellValue("否");
+            }else {
+                cell11.setCellValue("是");
+            }
+            HSSFCell cell12 = row.createCell(11 );
+            cell12.setCellValue(e.getCreateTime());
+            cell12.setCellStyle(dateStyle);
+        }
+        //设置流格式
+        response.setCharacterEncoding("UTF-8");
+        response.setContentType("application/vnd.ms-excel");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName);
+        response.flushBuffer();
+        workbook.write(response.getOutputStream());
+        workbook.close();
+    }
+    private List<EnforcementRegistration> enforcementRegistrationListToExport(EnforcementRegistration enforcementRegistration){
+        if(enforcementRegistration.getQy()!=null&&!"".equals(enforcementRegistration.getQy())){
+            if(enforcementRegistration.getJd()!=null&&!"".equals(enforcementRegistration.getJd())){
+                String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy());
+                String jd=iDictDataService.selectDictLabel(enforcementRegistration.getQy(),enforcementRegistration.getJd());
+                enforcementRegistration.setJd(jd);
+                enforcementRegistration.setQy(qy);
+                List<EnforcementRegistration> list = enforcementRegistrationMapper.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
+                for(int i=0;i<list.size();i++){
+                    list.get(i).setQy(qy);
+                    list.get(i).setJd(jd);
+                }
+                return list;
+            }else {
+                List<EnforcementRegistration> enforcementRegistrationList=new ArrayList<>();
+                String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy());
+                List<DictData> jdList=iDictDataService.selectDictDataByType(enforcementRegistration.getQy());
+                enforcementRegistration.setQy(qy);
+                List<EnforcementRegistration> list = enforcementRegistrationMapper.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
+                /*List<String> jdStrings=new ArrayList<>();
+                for(DictData dictData:jdList){
+                    jdStrings.add(dictData.getDictLabel());
+                }*/
+                for(DictData jd:jdList){
+                    List<EnforcementRegistration> jdEList=new ArrayList<>();
+                    if(qy.equals("光明区")){
+                        jdEList=list.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区"+jd.getDictLabel())||item.getEnterpriseAddress().startsWith("深圳市"+qy+jd.getDictLabel())).collect(Collectors.toList());
+                    }else {
+                        jdEList=list.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy+jd.getDictLabel())).collect(Collectors.toList());
+                    }
+                    if(jdEList.size()>0){
+                        for(int i=0;i<jdEList.size();i++){
+                            jdEList.get(i).setQy(qy);
+                            jdEList.get(i).setJd(jd.getDictLabel());
+                        }
+                        enforcementRegistrationList.addAll(jdEList);
+                    }
+                }
+                List<EnforcementRegistration>qtjdList=list.stream().filter(item->!jdMake(qy,jdList,item.getEnterpriseAddress())).collect(Collectors.toList());
+                if(qtjdList.size()>0){
+                    for(int i=0;i<qtjdList.size();i++){
+                        qtjdList.get(i).setQy(qy);
+                    }
+                    enforcementRegistrationList.addAll(qtjdList);
+                }
+                return enforcementRegistrationList;
+            }
+        }else {
+            List<DictData> qyList=iDictDataService.selectDictDataByType("address_Type");
+            List<String> qyStrings=new ArrayList<>();
+            for(DictData dictData:qyList){
+                qyStrings.add(dictData.getDictLabel());
+            }
+            List<EnforcementRegistration> list = enforcementRegistrationMapper.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
+            List<EnforcementRegistration> enforcementRegistrationsList=new ArrayList<>();
+            for(DictData qy:qyList){
+                List<DictData> jdList=iDictDataService.selectDictDataByType(qy.getDictValue());
+                /*List<String> jdStrings=new ArrayList<>();
+                for(DictData dictData:jdList){
+                    jdStrings.add(dictData.getDictLabel());
+                }*/
+                List<EnforcementRegistration> qyEList=new ArrayList<>();
+                if(qy.getDictLabel().equals("光明区")){
+                    qyEList=list.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区")||item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel())).collect(Collectors.toList());
+                }else {
+                    qyEList=list.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel())).collect(Collectors.toList());
+                }
+                for(DictData jd:jdList){
+                    List<EnforcementRegistration> jdEList=new ArrayList<>();
+                    if(qy.getDictLabel().equals("光明区")){
+                        jdEList=qyEList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区"+jd.getDictLabel())||item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel()+jd.getDictLabel())).collect(Collectors.toList());
+                    }else {
+                        jdEList=qyEList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel()+jd.getDictLabel())).collect(Collectors.toList());
+                    }
+                    if(jdEList.size()>0){
+                        for(int i=0;i<jdEList.size();i++){
+                            jdEList.get(i).setQy(qy.getDictLabel());
+                            jdEList.get(i).setJd(jd.getDictLabel());
+                        }
+                        enforcementRegistrationsList.addAll(jdEList);
+                    }
+                }
+                List<EnforcementRegistration>qtjdList=qyEList.stream().filter(item->!jdMake(qy.getDictLabel(),jdList,item.getEnterpriseAddress())).collect(Collectors.toList());
+                if(qtjdList.size()>0){
+                    for(int i=0;i<qtjdList.size();i++){
+                        qtjdList.get(i).setQy(qy.getDictLabel());
+                    }
+                    enforcementRegistrationsList.addAll(qtjdList);
+                }
+            }
+            List<EnforcementRegistration>qtqyList=list.stream().filter(item->!qyMake(qyStrings,item.getEnterpriseAddress())).collect(Collectors.toList());
+            if(qtqyList.size()>0){
+                enforcementRegistrationsList.addAll(qtqyList);
+            }
+            return enforcementRegistrationsList;
+        }
+    }
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseStreetMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseStreetMapper.xml
index acd3d33e..08e045f9 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseStreetMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseStreetMapper.xml
@@ -13,6 +13,7 @@
 
     <select id="selectEnterpriseStreetList" parameterType="EnterpriseStreet" resultMap="EnterpriseStreetResult">
         select enterprise_address from enterprise_information
+        where is_delete is not null and company_org_type is not null and enterprise_address is not null
     </select>
 
     <select id="selectEnterpriseName" parameterType="EnterpriseStreet" resultMap="EnterpriseStreetResult">
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
index 4294d7a6..d644b166 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
@@ -37,16 +37,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectZfryjdmList2" parameterType="Zfryjdm2405301" resultMap="ZfryjdmResult">
-        select z.id, z.sfyx, z.rylx, z.zfzzfdw, z.zfryid, z.name, z.sfzcode, z.zzjgdm, z.zfdw, z.address, z.sub_name, z.is_lawcode, z.code_state, z.zfcode, z.sfzcode_encrypt, s.phoneNumber from zfryjdm2405301 z
-        left join (select * from sys_user where status='0' and del_flag='0' group by certificateNumber) s
+        select z.id, z.sfyx, z.rylx, z.zfzzfdw, z.zfryid, z.name, z.sfzcode, z.zzjgdm, z.zfdw, z.address, z.sub_name, z.is_lawcode, z.code_state, z.zfcode, z.sfzcode_encrypt, s.phoneNumber
+        from (
+        select id, sfyx, rylx, zfzzfdw, zfryid, name, sfzcode, zzjgdm, zfdw, address, sub_name, is_lawcode, code_state, zfcode, sfzcode_encrypt
+        from zfryjdm2405301
+        <where>
+            and code_state = '01'
+            and name is not null
+            and zfdw is not null
+            and zfcode is not null
+            <if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
+            <if test="zfdw != null and zfdw != ''">and zfdw like concat('%',#{zfdw},'%')</if>
+            <if test="zfcode != null and zfcode != ''">and zfcode like concat('%',#{zfcode},'%')</if>
+        </where>) z
+        left join (select phoneNumber, certificateNumber from sys_user where status='0' and del_flag='0' group by certificateNumber) s
         on z.sfzcode_encrypt=s.certificateNumber
-        where z.code_state = '01'
-        and z.name is not null
-        and z.zfdw is not null
-        and z.zfcode is not null
-        <if test="name != null and name != ''">and z.name like concat('%',#{name},'%')</if>
-        <if test="zfdw != null and zfdw != ''">and z.zfdw like concat('%',#{zfdw},'%')</if>
-        <if test="zfcode != null and zfcode != ''">and z.zfcode like concat('%',#{zfcode},'%')</if>
         group by z.sfzcode
     </select>