Commit 66e9c6fe authored by 刘林's avatar 刘林

fix:(jg):管道补证功能修改

parent 08f53a52
...@@ -173,6 +173,7 @@ public class ChangeEquipImpactCertListener { ...@@ -173,6 +173,7 @@ public class ChangeEquipImpactCertListener {
Arrays.stream(manage.getFillingMedium().split(",")) Arrays.stream(manage.getFillingMedium().split(","))
.map(String::trim) .map(String::trim)
.map(v -> v.equals(beforeValue) ? afterValue : v) .map(v -> v.equals(beforeValue) ? afterValue : v)
.distinct()
.collect(Collectors.joining(",")) .collect(Collectors.joining(","))
); );
break; break;
......
...@@ -434,7 +434,9 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate ...@@ -434,7 +434,9 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
JgCertificateReplenishDto model = JSON.parseObject(JSONObject.toJSONString(jsonObj), JgCertificateReplenishDto.class); JgCertificateReplenishDto model = JSON.parseObject(JSONObject.toJSONString(jsonObj), JgCertificateReplenishDto.class);
// 校验设备在流程中 // 校验设备在流程中
CompanyBo company = getSelectedOrgInfo().getCompany(); CompanyBo company = getSelectedOrgInfo().getCompany();
model.getEquLists().forEach(device -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY).equipRepeatUsedCheck(String.valueOf(device.get(SEQUENCE_NBR)), CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode())); model.getEquLists().forEach(device -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
.equipRepeatUsedCheck(String.valueOf(device.get(SEQUENCE_NBR) != null ? device.get(SEQUENCE_NBR) : device.get(record)),
CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode()));
// 启动工作流 // 启动工作流
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getReceiveOrgCode().split("_")[0], model.getApplyNo()); List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getReceiveOrgCode().split("_")[0], model.getApplyNo());
WorkflowResultDto workflowResultDto = workflowResultList.get(0); WorkflowResultDto workflowResultDto = workflowResultList.get(0);
......
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