|
|
|
@ -601,6 +601,28 @@ public class AppEnforcementRegistrationController extends BaseController |
|
|
|
// }
|
|
|
|
reg.setEnterpriseEvaluate(enterpriseEvaluate); |
|
|
|
} |
|
|
|
|
|
|
|
for (EnterpriseLawEnforcement law : lawResults) { |
|
|
|
// 执法人员1需要展示用户名+执法码
|
|
|
|
UserBean userBean = userApi.getUserByUserId(Long.valueOf(law.getLawEnforcerId())); |
|
|
|
String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum()) ? "" : userBean.getLawCertificateNum(); |
|
|
|
law.setLawEnforcer(userBean.getUserName() + " " + lawCN); |
|
|
|
|
|
|
|
// 执法人员2需要展示用户名+执法码
|
|
|
|
List<UserBean> userBeans = new ArrayList<>(); |
|
|
|
if (StringUtils.isNotEmpty(law.getLawEnforcerTwoId())) { |
|
|
|
userBeans = userApi.getUserByUserIds(law.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); |
|
|
|
} |
|
|
|
law.setLawEnforcer2Show(tmpUserShow); |
|
|
|
} |
|
|
|
Map<String, List> result = new HashMap<>(); |
|
|
|
result.put("regResults", regResults); |
|
|
|
result.put("lawResults", lawResults); |
|
|
|
|