From 5fdbed68af0251ec75b3edb231f61db19bed6102 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 24 Sep 2024 17:28:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E7=AB=AF?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A2=84=E5=91=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EnterpriseComplaintServiceImpl.java  |  6 ++---
 .../EnterpriseLawEnforcementServiceImpl.java  | 27 ++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
index c4625922..48324e26 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
@@ -165,9 +165,9 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
     @Override
     public int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint)
     {
-        if ("入企不扫码".equals(enterpriseComplaint.getEnforceTypeText())) {
-            enterpriseComplaint.setEnforceType(null);
-        }
+//        if ("入企不扫码".equals(enterpriseComplaint.getEnforceTypeText())) {
+//            enterpriseComplaint.setEnforceType(null);
+//        }
         UserBean user = userApi.getUserByUserId(enterpriseComplaint.getUserId());
         System.out.println("========================");
         System.out.println("enterpriseComplaint.getUserId : "+ enterpriseComplaint.getUserId());
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java
index bc2ebe2d..6e4eda6e 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java
@@ -150,13 +150,26 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
     {
         List<EnterpriseLawEnforcement> enterpriseLawEnforcements =
                 enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementList(enterpriseLawEnforcement);
-//        for (int i = 0; i < enterpriseLawEnforcements.size(); i++) {
-            /*LinkageDict linkageDict =
-                    linkageDictService.selectLinkageDictById(enterpriseLawEnforcements.get(i).getCheckItem());
-            if(linkageDict != null){
-                enterpriseLawEnforcements.get(i).setCheckItem(linkageDict.getTitle());
-            }*/
-//        }
+        //查询联合检查部门
+        enterpriseLawEnforcements.forEach(res ->{
+            // 通过联合执法的批次id获取整个批次的联合执法 - 用来处理执法部门
+            List<EnterpriseLawEnforcement> lawUnites = new ArrayList<>();
+            if (StringUtils.isNotEmpty(res.getUniteCheck())) {
+                // 已登记联合检查
+                lawUnites = enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementByUniteCheck(res.getUniteCheck());
+            } else {
+                lawUnites.add(res);
+            }
+            Set<String> bureauDeptNames = new HashSet();
+            Set<String> bureauDeptIds = new HashSet();
+            for (EnterpriseLawEnforcement tmp : lawUnites) {
+                bureauDeptNames.add(tmp.getLawEnforcement());
+                bureauDeptIds.add(tmp.getLawEnforcementId());
+            }
+            res.setBureauDeptName(String.join(",", bureauDeptNames));
+            res.setBureauDeptId(String.join(",", bureauDeptIds));
+        });
+
         return enterpriseLawEnforcements;
     }