Commit 929fa698 authored by LiuLin's avatar LiuLin

fix(JG):设备移交保存字段返回

parent 169c48fb
...@@ -130,4 +130,10 @@ public class JgEquipTransferDto extends BaseDto { ...@@ -130,4 +130,10 @@ public class JgEquipTransferDto extends BaseDto {
@ApiModelProperty(value = "施工单位统一信用代码-数据隔离使用") @ApiModelProperty(value = "施工单位统一信用代码-数据隔离使用")
private String installUnitCodeFilter; private String installUnitCodeFilter;
/**
* 下一节点可执行人逗号分割
*/
@ApiModelProperty(value = "下一节点可执行人逗号分割-数据隔离使用")
private String nextExecuteUserIds;
} }
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
tec2.name AS equCategory, tec2.name AS equCategory,
tec1.name AS equList, tec1.name AS equList,
tec.name AS equDefine, tec.name AS equDefine,
jet.create_date AS createDate jet.create_date AS createDate,
jet.next_execute_user_ids as nextExecuteUserIds
FROM FROM
tzs_jg_equip_transfer jet tzs_jg_equip_transfer jet
LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
......
...@@ -272,6 +272,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, ...@@ -272,6 +272,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
transfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode())); transfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
transfer.setNextTaskId(workflowResultDto.getNextTaskId()); transfer.setNextTaskId(workflowResultDto.getNextTaskId());
transfer.setInstanceId(workflowResultDto.getInstanceId()); transfer.setInstanceId(workflowResultDto.getInstanceId());
transfer.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
updateById(transfer); updateById(transfer);
//删除暂存 //删除暂存
...@@ -414,6 +415,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, ...@@ -414,6 +415,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0); WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
equipTransfer.setPromoter(""); equipTransfer.setPromoter("");
equipTransfer.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds()); equipTransfer.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
equipTransfer.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
equipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode())); equipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
equipTransfer.setNextTaskId(workflowResultDto.getNextTaskId()); equipTransfer.setNextTaskId(workflowResultDto.getNextTaskId());
baseMapper.updateById(equipTransfer); baseMapper.updateById(equipTransfer);
......
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