Commit 6e9a27da authored by 刘凡's avatar 刘凡

优化:移装变更 暂存任务及撤回任务修改

parent 00b199ba
......@@ -135,8 +135,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
ICmWorkflowService icmWorkflowService;
@Autowired
CommonServiceImpl commonService;
@Value("classpath:/json/urlInfo.json")
private Resource bizTypeInfo;
/**
* 新增移装变更登记
......@@ -299,6 +297,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//发起流程
if ("1".equals(submitType)) {
String instanceId = "";
if (!ValidationUtil.isEmpty(oldTransfer.getSequenceNbr()) && !ValidationUtil.isEmpty(oldTransfer.getInstanceId())) {
this.flowExecute(oldTransfer.getSequenceNbr(), oldTransfer.getInstanceId(), "0", "");
} else {
......@@ -314,9 +313,21 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
WorkflowResultDto workflowResult = this.startWorkFlork(oldTransfer.getReceiveOrgCode());
this.updateExecuteIds(instanceId, oldTransfer, "startWorkfow", workflowResult);
//删除旧的代办
commonService.deleteTaskModel(oldTransfer.getSequenceNbr().toString());
//生成代办
this.createToDoTask(Arrays.asList(workflowResult), oldTransfer, submitType);
}
}else {
List<TaskModelDto> modelDtos = new ArrayList<>();
TaskModelDto dto = new TaskModelDto();
dto.setModel(oldTransfer);
dto.setTaskContent(this.getSummaryInfo(oldTransfer));
dto.setTaskCode(oldTransfer.getApplyNo());
dto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
dto.setRelationId(oldTransfer.getSequenceNbr() + "");
modelDtos.add(dto);
commonService.buildTaskModel(modelDtos);
}
return true;
}
......
......@@ -120,6 +120,12 @@
},
{
"type": "110",
"pageType": "draft",
"name": "移装变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "110",
"pageType": "look",
"name": "移装变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&roleIds={roleIds}&userId={userId}&pageType=look"
......@@ -128,7 +134,7 @@
"type": "110",
"pageType": "edit",
"name": "移装变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&roleIds={roleIds}&userId={userId}&pageType=edit"
"url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "111",
......
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