配合前端的文字顺序之类的修改

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

@@ -86,6 +86,29 @@ public class AppEnforcementRegistrationController extends BaseController
             } else {
                 ee.setComOrOpi(0);
             }
+
+            // 执法人员1需要展示用户名+执法码
+            UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId());
+            String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum();
+            ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN);
+
+            // 执法人员2需要展示用户名+执法码
+            List<String> lawTwoList = new ArrayList<>();
+            List<UserBean> userBeans = new ArrayList<>();
+            if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) {
+                userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo());
+            }
+//            String tmpUserShow = "";
+            for (UserBean ub : userBeans) {
+                String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
+//                tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ",";
+                lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum);
+            }
+//            if (tmpUserShow.length() > 0) {
+//                tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
+//            }
+            ee.setLawEnforcer2List(lawTwoList);
+
             // 判断超时多少天
             Instant instant = ee.getEnforcementTime().toInstant();
             ZoneId zoneId = ZoneId.systemDefault();
@@ -259,10 +282,9 @@ public class AppEnforcementRegistrationController extends BaseController
             // 执法人员1需要展示用户名+执法码
             UserBean userBean = userApi.getUserByUserId(enforcementRegistration.getLawEnforcerId());
             String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum();
-            enforcementRegistration.setLawEnforcer(userBean.getUserName() +" - "+ lawCN);
+            enforcementRegistration.setLawEnforcer(userBean.getUserName() +" "+ lawCN);
 
             // 执法人员2需要展示用户名+执法码
-//            List<UserBean> userBeans = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
             List<UserBean> userBeans = new ArrayList<>();
             if (StringUtils.isNotEmpty(enforcementRegistration.getLawEnforcerIdTwo())) {
                 userBeans = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
@@ -270,7 +292,7 @@ public class AppEnforcementRegistrationController 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);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -165,8 +165,18 @@ public class EnforcementRegistration extends BaseDomain
     private List fileListObj;
     /** 超时几天(临时用的, 判断检查时间是否超过5天) */
     private long outTimeDayNum;
-    // 用来展示执法人员名称 - 执法编码的
+    // 用来展示执法人员名称 - 执法编码的 (拼接字符串)
     private String lawEnforcer2Show;
+    // 用来展示执法人员名称 - 执法编码的 (List)
+    private List<String> lawEnforcer2List;
+
+    public List<String> getLawEnforcer2List() {
+        return lawEnforcer2List;
+    }
+
+    public void setLawEnforcer2List(List<String> lawEnforcer2List) {
+        this.lawEnforcer2List = lawEnforcer2List;
+    }
 
     public String getLawEnforcer2Show() {
         return lawEnforcer2Show;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java

@@ -75,7 +75,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
             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);