Commit f5b88ae7 authored by suhuiguang's avatar suhuiguang

feat(流程执行适配):支持多公司

1.代码还原
parent edc1a018
...@@ -2238,7 +2238,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2238,7 +2238,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus())) { if (WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus())) {
// 一级驳回到使用单位 // 一级驳回到使用单位
dto.setNextExecuteUserCompanyCode(jgUseRegistration.getUseUnitCreditCode()); dto.setNextExecuteUserCompanyCode(jgUseRegistration.getUseUnitCreditCode());
dto.setNextExecuteUserOrgCode(jgUseRegistration.getUseUnitCreditCode()); dto.setNextExecuteUserOrgCode(null);
} }
//特殊登记,安全监察驳回到一级 //特殊登记,安全监察驳回到一级
if ("2".equals(jgUseRegistration.getRegType())) { if ("2".equals(jgUseRegistration.getRegType())) {
...@@ -2275,28 +2275,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2275,28 +2275,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if ("2".equals(jgUseRegistration.getRegType()) && (WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus()) if ("2".equals(jgUseRegistration.getRegType()) && (WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus())
|| WorkFlowStatusEnum.USE_RECEIVE.getRollBack().equals(jgUseRegistration.getStatus()) || WorkFlowStatusEnum.USE_RECEIVE.getRollBack().equals(jgUseRegistration.getStatus())
|| WorkFlowStatusEnum.USE_RECEIVE.getReject().equals(jgUseRegistration.getStatus()) )) { || WorkFlowStatusEnum.USE_RECEIVE.getReject().equals(jgUseRegistration.getStatus()) )) {
List<AgencyUserModel> taskExecutor = Privilege.agencyUserClient
.queryByRoleId(String.join(",", JIAN_CHA_ROLE_ID), null,
true, true, "", buildOrgCodePrefixes(orgCode)).getResult();
if (!ValidationUtil.isEmpty(taskExecutor)) {
Optional<String> companyCodeOpt = taskExecutor.stream()
.map(AgencyUserModel::getCompanys)
.filter(list -> list != null && !list.isEmpty())
.flatMap(List::stream)
.filter(c -> "county".equalsIgnoreCase(c.getLevel()))
.map(CompanyModel::getCompanyCode)
.findFirst();
if (!companyCodeOpt.isPresent()) {
companyCodeOpt = taskExecutor.stream()
.map(AgencyUserModel::getCompanys)
.filter(list -> list != null && !list.isEmpty())
.flatMap(List::stream)
.filter(c -> "prefecture-level".equalsIgnoreCase(c.getLevel()))
.map(CompanyModel::getCompanyCode)
.findFirst();
}
companyCodeOpt.ifPresent(dto::setNextExecuteUserCompanyCode);
}
dto.setResultCode("approvalStatus"); dto.setResultCode("approvalStatus");
map.put("approvalStatus", "9"); map.put("approvalStatus", "9");
map.put("nextExecuteUserOrgCode", orgCode); map.put("nextExecuteUserOrgCode", orgCode);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment