From b275263e5a2c44693960e371d941093f6c0e94f4 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Fri, 11 Jul 2025 17:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=83=A8=E9=97=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dept/mapper/DeptMapper.java        |  2 ++
 .../resources/mapper/system/DeptMapper.xml    |  9 +++++++
 .../statisticsEnterprise.html                 | 20 +++++++-------
 .../EnterpriseInformationServiceImpl.java     | 14 +++++-----
 .../impl/StatisticsEnterpriseServiceImpl.java |  8 +++---
 .../impl/Zfztjdm111915ServiceImpl.java        | 27 ++++++++++++++++---
 6 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java
index f606bd98..d65e55e4 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java
@@ -62,6 +62,8 @@ public interface DeptMapper
      */
     List<Dept> selectDeptList(Dept dept);
 
+    List<Dept> selectDeptByZone();
+
     /**
      * 根据部门信息获取当前及一下所有部门(下钻)
      *
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
index d5c43aa9..f85bf493 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
@@ -189,6 +189,15 @@
         order by d.parent_id, d.order_num
     </select>
 
+
+    <select id="selectDeptByZone"  resultMap="DeptResult">
+        <include refid="selectDeptVo"/>
+        where d.del_flag = '0'
+        and d.zone is not null
+        and d.zone != 2
+        order by d.parent_id, d.order_num
+    </select>
+
     <select id="selectDeptListByNoPermission" parameterType="Dept" resultMap="DeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
index 9b82d40d..f1e76901 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
@@ -92,7 +92,7 @@
                                 <p th:text="|全市:|"></p>
                                 <p><label th:text="企业数量"></label><b th:text="${number}"></b></p>
                                 <p></i><label th:text="续存企业数量"></label><b th:text="${exist}"></b></p>
-                                <p></i><label th:text="注销企业数量"></label><b th:text="${logout}"></b></p>
+<!--                                <p></i><label th:text="注销企业数量"></label><b th:text="${logout}"></b></p>-->
                             </li>
 
                         </ul>
@@ -241,11 +241,11 @@
                     field : 'numInt',
                     title : '续存企业数量',
                 },
-                {
-                    field : 'value',
-                    title : '注销企业数量',
-                    visible: false
-                },
+                // {
+                //     field : 'value',
+                //     title : '注销企业数量',
+                //     visible: false
+                // },
                 {
                     title : '详情',
                     formatter:function (value,row,index) {
@@ -509,10 +509,10 @@
                             field : 'numInt',
                             title : '续存企业数量',
                         },
-                        {
-                            field : 'value',
-                            title : '注销企业数量',
-                        },
+                        // {
+                        //     field : 'value',
+                        //     title : '注销企业数量',
+                        // },
                         {
                             title:'详情',
                             formatter:function (value,row,index) {
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
index 1a94bab7..f7062ca5 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
@@ -757,7 +757,7 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
             String companyOrgType=dictDataMapper.selectDictLabel("enterpriseType",searchType.getCompanyOrgType());
             enterpriseInformationList=enterpriseInformationList.stream().filter(item->item.getCompanyOrgType().contains(companyOrgType)).collect(Collectors.toList());
         }
-        List<DeptBean> checkDept = check(enterpriseInformation);
+//        List<DeptBean> checkDept = check(enterpriseInformation);
         String qyName = searchType.getName();
         DictData dictData = new DictData();
         dictData.setDictType("address_type");
@@ -776,12 +776,12 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
             s.setTotalNumber(jdList.size());
             s.setNumInt(existList.size());
             s.setValue(logoutList.size());
-            if (checkDept == null){
-                statisticsIndicatorList.add(s);
-            }else if (checkDept.size()!=0 && checkDept.stream().anyMatch(e -> e.getDeptName().equals(jdName))) {
-                statisticsIndicatorList.add(s);
-            }
-//            statisticsIndicatorList.add(s);
+//            if (checkDept == null){
+//                statisticsIndicatorList.add(s);
+//            }else if (checkDept.size()!=0 && checkDept.stream().anyMatch(e -> e.getDeptName().equals(jdName))) {
+//                statisticsIndicatorList.add(s);
+//            }
+            statisticsIndicatorList.add(s);
             enterpriseInformationList = enterpriseInformationList.stream().filter(item -> !item.getEnterpriseAddress().startsWith("深圳市" + qyName.substring(0, qyName.indexOf("区")) + "区" + jdName) && !item.getEnterpriseAddress().startsWith("深圳市" + qyName.substring(0, qyName.indexOf("区")) + "新区" + jdName)).collect(Collectors.toList());
         }
         if (enterpriseInformationList.size() > 0) {
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticsEnterpriseServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticsEnterpriseServiceImpl.java
index 3696aae9..c0f2170d 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticsEnterpriseServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticsEnterpriseServiceImpl.java
@@ -259,7 +259,7 @@ public class StatisticsEnterpriseServiceImpl implements StatisticsEnterpriseServ
         styleRow2.setBorderLeft(BorderStyle.THIN);
         styleRow2.setFont(font2);
         //设置表头
-        String[] headerList = {"区域", "企业数量", "续存企业数量","注销企业数量"};
+        String[] headerList = {"区域", "企业数量", "续存企业数量"};
         int qyRowNum=0;
         HSSFRow headerRow = sheet1.createRow(qyRowNum);
         qyRowNum++;
@@ -276,14 +276,14 @@ public class StatisticsEnterpriseServiceImpl implements StatisticsEnterpriseServ
                 s1row.createCell(0).setCellValue(s.getName());
                 s1row.createCell(1).setCellValue(s.getTotalNumber());
                 s1row.createCell(2).setCellValue(s.getNumInt());
-                s1row.createCell(3).setCellValue(s.getValue());
+//                s1row.createCell(3).setCellValue(s.getValue());
                 qyRowNum++;
                 if(!s.getName().equals("其他")) {
                     //街道页
                     HSSFSheet sheet = workbook.createSheet(s.getName());
                     sheet.setDefaultColumnWidth(20);//全局
                     //设置表头
-                    String[] hList = {"区域", "街道", "企业数量", "续存企业数量", "注销企业数量"};
+                    String[] hList = {"区域", "街道", "企业数量", "续存企业数量"};
                     int jdRowNum = 0;
                     HSSFRow hRow = sheet.createRow(jdRowNum);
                     jdRowNum++;
@@ -308,7 +308,7 @@ public class StatisticsEnterpriseServiceImpl implements StatisticsEnterpriseServ
                             row.createCell(1).setCellValue(sjd.getName());
                             row.createCell(2).setCellValue(sjd.getTotalNumber());
                             row.createCell(3).setCellValue(sjd.getNumInt());
-                            row.createCell(4).setCellValue(sjd.getValue());
+//                            row.createCell(4).setCellValue(sjd.getValue());
                             jdRowNum++;
                         }
                     }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java
index 733e2655..0e17139a 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zdxt.code.service.impl;
 
+import com.zdxt.auth.project.system.dept.mapper.DeptMapper;
 import com.zdxt.code.domain.Zfryjdm2405301;
 import com.zdxt.code.domain.Zfztjdm111915;
 import com.zdxt.code.mapper.Zfztjdm111915Mapper;
@@ -7,11 +8,14 @@ import com.zdxt.code.service.IZfryjdm2405301Service;
 import com.zdxt.code.service.IZfztjdm111915Service;
 import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.util.IdCardCryptoUtil;
+import com.zdxt.domain.auth.Dept;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -19,6 +23,9 @@ import java.util.stream.Collectors;
 public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service {
     @Autowired
     private Zfztjdm111915Mapper zfztjdm111915Mapper;
+
+    @Autowired
+    private DeptMapper deptMapper;
     @Autowired
     private IZfryjdm2405301Service iZfryjdm2405301Service;
     @Override
@@ -37,18 +44,24 @@ public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service {
     public List<Zfztjdm111915> getDeptStaticList(Zfryjdm2405301 zfryjdm2405301) {
 //        int totalNumber=0;
         List<Zfztjdm111915> zfztjdm111915List = zfztjdm111915Mapper.selectZfztjdmListAndDeptScope(zfryjdm2405301);
+        List<Dept> depts = deptMapper.selectDeptByZone();
+        if (CollectionUtils.isEmpty(depts)) return new ArrayList<>();
+        HashSet<String> collect = depts.stream().map(Dept::getDeptId).collect(Collectors.toCollection(HashSet::new));
+        zfztjdm111915List = zfztjdm111915List.stream().filter(i -> collect.contains(i.getDeptId())).collect(Collectors.toList());
 //        Map<String,Zfztjdm111915> zfztjdm111915Map=zfztjdm111915List.stream().collect(Collectors.toMap(Zfztjdm111915::getCode, Function.identity()));
         List<Zfztjdm111915> hasList=new ArrayList<>();
         List<Zfryjdm2405301> zfryjdm2405301List = iZfryjdm2405301Service.selectZfryjdmAndUserListGroupBy(zfryjdm2405301);
         for (int i = 0; i < zfztjdm111915List.size(); i++) {
             int j=i;
-            List<Zfryjdm2405301> ancestorList=zfryjdm2405301List.stream().filter(item->ancestorHasIt(item.getAncestors(),zfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
+            List<Zfztjdm111915> finalZfztjdm111915List = zfztjdm111915List;
+            List<Zfryjdm2405301> ancestorList=zfryjdm2405301List.stream().filter(item->ancestorHasIt(item.getAncestors(), finalZfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
 //            totalNumber=totalNumber+ancestorList.size();
             zfztjdm111915List.get(i).setNumber(ancestorList.size());
             if(ancestorList.size()>0){
                 hasList.add(zfztjdm111915List.get(i));
             }
-            zfryjdm2405301List=zfryjdm2405301List.stream().filter(item->!ancestorHasIt(item.getAncestors(),zfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
+            List<Zfztjdm111915> finalZfztjdm111915List1 = zfztjdm111915List;
+            zfryjdm2405301List=zfryjdm2405301List.stream().filter(item->!ancestorHasIt(item.getAncestors(), finalZfztjdm111915List1.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
         }
         if((zfryjdm2405301.getName()!=null&&!zfryjdm2405301.getName().equals(""))||(zfryjdm2405301.getZfcode()!=null&&!zfryjdm2405301.getZfcode().equals(""))){
             return hasList;
@@ -61,14 +74,20 @@ public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service {
     public int getZFRYNumber(Zfryjdm2405301 zfryjdm2405301) {
         int totalNumber=0;
         List<Zfztjdm111915> zfztjdm111915List = zfztjdm111915Mapper.selectZfztjdmListAndDeptScope(zfryjdm2405301);
+        List<Dept> depts = deptMapper.selectDeptByZone();
+        if (CollectionUtils.isEmpty(depts)) return 0;
+        HashSet<String> collect = depts.stream().map(Dept::getDeptId).collect(Collectors.toCollection(HashSet::new));
+        zfztjdm111915List = zfztjdm111915List.stream().filter(i -> collect.contains(i.getDeptId())).collect(Collectors.toList());
 //        Map<String,Zfztjdm111915> zfztjdm111915Map=zfztjdm111915List.stream().collect(Collectors.toMap(Zfztjdm111915::getCode, Function.identity()));
         List<Zfryjdm2405301> zfryjdm2405301List = iZfryjdm2405301Service.selectZfryjdmAndUserListGroupBy(zfryjdm2405301);
         for (int i = 0; i < zfztjdm111915List.size(); i++) {
             int j=i;
-            List<Zfryjdm2405301> ancestorList=zfryjdm2405301List.stream().filter(item->ancestorHasIt(item.getAncestors(),zfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
+            List<Zfztjdm111915> finalZfztjdm111915List = zfztjdm111915List;
+            List<Zfryjdm2405301> ancestorList=zfryjdm2405301List.stream().filter(item->ancestorHasIt(item.getAncestors(), finalZfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
             totalNumber=totalNumber+ancestorList.size();
             zfztjdm111915List.get(i).setNumber(ancestorList.size());
-            zfryjdm2405301List=zfryjdm2405301List.stream().filter(item->!ancestorHasIt(item.getAncestors(),zfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
+            List<Zfztjdm111915> finalZfztjdm111915List1 = zfztjdm111915List;
+            zfryjdm2405301List=zfryjdm2405301List.stream().filter(item->!ancestorHasIt(item.getAncestors(), finalZfztjdm111915List1.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
         }
         return totalNumber;
     }