修改企业端检查预告修改

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());

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;
     }