Commit bf71572d authored by tianbo's avatar tianbo

refactor(jg):重构履历路由路径生成逻辑

- 提取生成履历待办routePath的逻辑到独立方法getRoutePath - 简化saveResumeInfo方法调用,统一使用this前缀 -为变更记录设置正确的routePath值
parent 810616a8
...@@ -2899,12 +2899,7 @@ public class DataDockServiceImpl { ...@@ -2899,12 +2899,7 @@ public class DataDockServiceImpl {
resumeInfo.setBusinessId(jgUseRegistration.getSequenceNbr() + ""); resumeInfo.setBusinessId(jgUseRegistration.getSequenceNbr() + "");
resumeInfo.setStatus("正常"); resumeInfo.setStatus("正常");
resumeInfo.setCreateDate(new Date()); resumeInfo.setCreateDate(new Date());
// 生成履历待办routePath resumeInfo.setRoutePath(getRoutePath(equ, jgUseRegistration));
EquipRequestParamsDto paramsDto = EquipRequestParamsDto.builder()
.equipId(equ.get("record").toString())
.equListCode(equ.get("equList").toString()).build();
String routePath = buildTaskModel(jgUseRegistration, paramsDto);
resumeInfo.setRoutePath(routePath);
resumeInfo.setChangeContent(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName() + "业务办理"); resumeInfo.setChangeContent(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName() + "业务办理");
} }
resumeInfo.setApprovalUnit(jgUseRegistration.getReceiveOrgName()); resumeInfo.setApprovalUnit(jgUseRegistration.getReceiveOrgName());
...@@ -2914,6 +2909,14 @@ public class DataDockServiceImpl { ...@@ -2914,6 +2909,14 @@ public class DataDockServiceImpl {
jgResumeInfoService.saveOrUpdate(resumeInfo); jgResumeInfoService.saveOrUpdate(resumeInfo);
} }
private String getRoutePath(Map<String, Object> equ, JgUseRegistration jgUseRegistration) {
// 生成履历待办routePath
EquipRequestParamsDto paramsDto = EquipRequestParamsDto.builder()
.equipId(equ.get("record").toString())
.equListCode(equ.get("equList").toString()).build();
return buildTaskModel(jgUseRegistration, paramsDto);
}
/** /**
* 历史设备登记-》更新维保信息 * 历史设备登记-》更新维保信息
*/ */
...@@ -3035,7 +3038,7 @@ public class DataDockServiceImpl { ...@@ -3035,7 +3038,7 @@ public class DataDockServiceImpl {
this.historyEquGenManageRelated(map, jgUseRegistration); this.historyEquGenManageRelated(map, jgUseRegistration);
// 生成监管履历信息 // 生成监管履历信息
saveResumeInfo(map, jgUseRegistration); this.saveResumeInfo(map, jgUseRegistration);
} catch (BadRequest | LocalBadRequest e) { } catch (BadRequest | LocalBadRequest e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
this.rollBackForDelRedisData(); this.rollBackForDelRedisData();
...@@ -3092,7 +3095,7 @@ public class DataDockServiceImpl { ...@@ -3092,7 +3095,7 @@ public class DataDockServiceImpl {
changeRecord.setUseUnitName(jgUseRegistration.getUseUnitName());//使用单位名称 changeRecord.setUseUnitName(jgUseRegistration.getUseUnitName());//使用单位名称
changeRecord.setEquCategory(Objects.toString(map.get("equCategory")));//设备类别编码 changeRecord.setEquCategory(Objects.toString(map.get("equCategory")));//设备类别编码
changeRecord.setCreateDate(new Date()); changeRecord.setCreateDate(new Date());
changeRecord.setRoutePath(""); changeRecord.setRoutePath(getRoutePath(map, jgUseRegistration));
changeRecord.setSequenceNbr(changeRecordId); changeRecord.setSequenceNbr(changeRecordId);
certificateChangeRecordService.save(changeRecord); certificateChangeRecordService.save(changeRecord);
} }
......
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