Commit a5425037 authored by LiuLin's avatar LiuLin

fix(JG):改造告知,设备移交代码提交

parent 45c87c15
...@@ -384,7 +384,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, ...@@ -384,7 +384,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
jgEquipTransfer.setSupervisoryCode(jgEquipTransferDto.getSupervisoryCode()); jgEquipTransfer.setSupervisoryCode(jgEquipTransferDto.getSupervisoryCode());
jgEquipTransfer.setEquList(jgEquipTransferDto.getEquList()); jgEquipTransfer.setEquList(jgEquipTransferDto.getEquList());
jgEquipTransfer.setNextTaskId(workflowResultDto.getNextTaskId()); jgEquipTransfer.setNextTaskId(workflowResultDto.getNextTaskId());
jgEquipTransfer.setInstanceId(workflowResultDto.getInstanceId()); //jgEquipTransfer.setInstanceId(workflowResultDto.getInstanceId());
// 上个代办改为驳回 // 上个代办改为驳回
taskV2Model = this.updateLastTodo(jgEquipTransfer, FlowStatusEnum.REJECTED); taskV2Model = this.updateLastTodo(jgEquipTransfer, FlowStatusEnum.REJECTED);
this.createNewTodo(jgEquipTransfer, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_SUBMITTED); this.createNewTodo(jgEquipTransfer, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_SUBMITTED);
......
...@@ -749,7 +749,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -749,7 +749,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
jgReformNotice.setSupervisoryCode(dto.getSupervisoryCode()); jgReformNotice.setSupervisoryCode(dto.getSupervisoryCode());
jgReformNotice.setEquList(dto.getEquList()); jgReformNotice.setEquList(dto.getEquList());
jgReformNotice.setNextTaskId(workflowResultDto.getNextTaskId()); jgReformNotice.setNextTaskId(workflowResultDto.getNextTaskId());
jgReformNotice.setInstanceId(workflowResultDto.getInstanceId()); //jgReformNotice.setInstanceId(workflowResultDto.getInstanceId());
// 上个代办改为驳回 // 上个代办改为驳回
taskV2Model = this.updateLastTodo(jgReformNotice, FlowStatusEnum.REJECTED); taskV2Model = this.updateLastTodo(jgReformNotice, FlowStatusEnum.REJECTED);
......
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