From 17d2df3cccca4d51edc425b560e1ba4843ff147a Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 16 Aug 2024 10:42:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=90=88=E5=89=8D=E7=AB=AF=E7=9A=84?= =?UTF-8?q?=E6=96=87=E5=AD=97=E9=A1=BA=E5=BA=8F=E4=B9=8B=E7=B1=BB=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 28 +++++++++++++++++-- .../code/domain/EnforcementRegistration.java | 12 +++++++- .../EnterpriseLawEnforcementServiceImpl.java | 2 +- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index de7f4f33..3b822dfd 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/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 lawTwoList = new ArrayList<>(); + List 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 userBeans = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo()); List 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); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java index b319b0da..4c0496a7 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java +++ b/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 lawEnforcer2List; + + public List getLawEnforcer2List() { + return lawEnforcer2List; + } + + public void setLawEnforcer2List(List lawEnforcer2List) { + this.lawEnforcer2List = lawEnforcer2List; + } public String getLawEnforcer2Show() { return lawEnforcer2Show; 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 5e1f0aad..26c1b475 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 @@ -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);