|
|
@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil; |
|
|
import com.zdxt.auth.dto.UserBean; |
|
|
import com.zdxt.auth.dto.UserBean; |
|
|
import com.zdxt.auth.feign.UserApi; |
|
|
import com.zdxt.auth.feign.UserApi; |
|
|
import com.zdxt.auth.feign.ZdxtFileCommonApi; |
|
|
import com.zdxt.auth.feign.ZdxtFileCommonApi; |
|
|
|
|
|
import com.zdxt.code.domain.EnforcementRegistration; |
|
|
import com.zdxt.code.domain.EnterpriseMerchantAuthorization; |
|
|
import com.zdxt.code.domain.EnterpriseMerchantAuthorization; |
|
|
import com.zdxt.code.domain.LinkageDict; |
|
|
import com.zdxt.code.domain.LinkageDict; |
|
|
import com.zdxt.code.service.IEnterpriseMerchantAuthorizationService; |
|
|
import com.zdxt.code.service.IEnterpriseMerchantAuthorizationService; |
|
|
@ -59,6 +60,29 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc |
|
|
{ |
|
|
{ |
|
|
EnterpriseLawEnforcement enterpriseLawEnforcement = |
|
|
EnterpriseLawEnforcement enterpriseLawEnforcement = |
|
|
enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(id); |
|
|
enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(id); |
|
|
|
|
|
|
|
|
|
|
|
// 通过联合执法的批次id获取整个批次的联合执法 - 用来处理执法部门
|
|
|
|
|
|
List<EnterpriseLawEnforcement> lawUnites = new ArrayList<>(); |
|
|
|
|
|
if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getUniteCheck())) { |
|
|
|
|
|
// 已登记联合检查
|
|
|
|
|
|
lawUnites = enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementByUniteCheck(enterpriseLawEnforcement.getUniteCheck()); |
|
|
|
|
|
} else { |
|
|
|
|
|
lawUnites.add(enterpriseLawEnforcement); |
|
|
|
|
|
} |
|
|
|
|
|
String bureauDeptName = "", bureauDeptId = ""; |
|
|
|
|
|
for (EnterpriseLawEnforcement tmp : lawUnites) { |
|
|
|
|
|
bureauDeptName += tmp.getBureauDeptName() +","; |
|
|
|
|
|
bureauDeptId += tmp.getBureauDeptId() +","; |
|
|
|
|
|
} |
|
|
|
|
|
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); |
|
|
|
|
|
|
|
|
// 执法人员1需要展示执法码
|
|
|
// 执法人员1需要展示执法码
|
|
|
if(enterpriseLawEnforcement.getLawEnforcerId() != null){ |
|
|
if(enterpriseLawEnforcement.getLawEnforcerId() != null){ |
|
|
UserBean user = userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerId())); |
|
|
UserBean user = userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerId())); |
|
|
|