|
|
|
@ -1,7 +1,9 @@ |
|
|
|
package com.zdxt.code.service.impl; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashSet; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Set; |
|
|
|
|
|
|
|
import cn.hutool.core.convert.Convert; |
|
|
|
import cn.hutool.core.util.IdUtil; |
|
|
|
@ -69,19 +71,14 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc |
|
|
|
} else { |
|
|
|
lawUnites.add(enterpriseLawEnforcement); |
|
|
|
} |
|
|
|
String bureauDeptName = "", bureauDeptId = ""; |
|
|
|
Set<String> bureauDeptNames = new HashSet(); |
|
|
|
Set<String> bureauDeptIds = new HashSet(); |
|
|
|
for (EnterpriseLawEnforcement tmp : lawUnites) { |
|
|
|
bureauDeptName += tmp.getBureauDeptName() +","; |
|
|
|
bureauDeptId += tmp.getBureauDeptId() +","; |
|
|
|
bureauDeptNames.add(tmp.getLawEnforcement()); |
|
|
|
bureauDeptIds.add(tmp.getLawEnforcementId()); |
|
|
|
} |
|
|
|
if(!bureauDeptName.equals("")){ |
|
|
|
bureauDeptName = bureauDeptName.substring(0,bureauDeptName.length()-1); |
|
|
|
} |
|
|
|
if(!bureauDeptId.equals("")){ |
|
|
|
bureauDeptId = bureauDeptId.substring(0,bureauDeptId.length()-1); |
|
|
|
} |
|
|
|
enterpriseLawEnforcement.setBureauDeptName(bureauDeptName); |
|
|
|
enterpriseLawEnforcement.setBureauDeptId(bureauDeptId); |
|
|
|
enterpriseLawEnforcement.setBureauDeptName(String.join(",", bureauDeptNames)); |
|
|
|
enterpriseLawEnforcement.setBureauDeptId(String.join(",", bureauDeptIds)); |
|
|
|
|
|
|
|
// 执法人员1需要展示执法码
|
|
|
|
if(enterpriseLawEnforcement.getLawEnforcerId() != null){ |
|
|
|
|