Merge remote-tracking branch 'origin/v2' into v2

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java

@@ -175,12 +175,12 @@ public class AppEnforcementRegistrationController extends BaseController
             resNum = enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration);
             if (resNum > 0 && StringUtils.isNotEmpty(enforcementRegistration.getLawId())) {
                 enforcementRegistration.setId(null);
-                EnterpriseLawEnforcement law = new EnterpriseLawEnforcement();
-                law.setId(enforcementRegistration.getLawId());
-                law.setIsReg(1);
-                resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law);
             }
         }
+        EnterpriseLawEnforcement law = new EnterpriseLawEnforcement();
+        law.setId(enforcementRegistration.getLawId());
+        law.setIsReg(1);
+        resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law);
         return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
     }
 

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java

@@ -92,6 +92,21 @@ public class AppEnterpriseLawEnforcementController extends BaseController
 //            }
 //        }
         for (EnterpriseLawEnforcement ee : list) {
+            // 执法人员2需要展示用户名+执法码
+            List<UserBean> userBeans = new ArrayList<>();
+            if (StringUtils.isNotEmpty(ee.getLawEnforcerTwoId())) {
+                userBeans = userApi.getUserByUserIds(ee.getLawEnforcerTwoId());
+            }
+            String tmpUserShow = "";
+            for (UserBean ub : userBeans) {
+                String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
+                tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ",";
+            }
+            if (tmpUserShow.length() > 0) {
+                tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
+            }
+            ee.setLawEnforcer2Show(tmpUserShow);
+
             // 判断是否超时
             LocalDate checkTime = LocalDate.parse(ee.getCheckTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             long daysBetween = ChronoUnit.DAYS.between(LocalDate.now(), checkTime);
@@ -171,6 +186,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController
         // 统一联合工单号. 用去区分是否为同一工单用, 回显的是用到
         enterpriseLawEnforcement.setUniteCheck(IdUtil.simpleUUID());
         // 先单独处理主单
+        enterpriseLawEnforcement.setTmpDeptJson(JSON.toJSONString(enterpriseLawEnforcement.getUserObjs()));
         if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getId())) {
             resNum += enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(enterpriseLawEnforcement);
             enterpriseLawEnforcement.setId(null);
@@ -219,7 +235,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController
             }
 
             // 下发短信
-//            this.sendSms(enterpriseLawEnforcement);
+            this.sendSms(enterpriseLawEnforcement);
         }
         return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
     }
@@ -365,7 +381,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController
         String tmpUserShow = "";
         for (UserBean ub : userBeans) {
             String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
-            tmpUserShow += ub.getUserName() +"-"+ lawCertificateNum + ",";
+            tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ",";
         }
         if (tmpUserShow.length() > 0) {
             tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);