wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-09-08 10:52:30 +08:00
parent f79a3bfd45
commit da97c50bac
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -431,15 +431,17 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowRecord.setFlowStaffIdRole(staffRoles); flowRecord.setFlowStaffIdRole(staffRoles);
flowRecord.setStatusName(FlowRecordEnum.APPROVALING.getName()); flowRecord.setStatusName(FlowRecordEnum.APPROVALING.getName());
FlowRecord lastFlowRecordNoStatus = flowRecordService.selectLastFlowNoStatusRecordByRecordId(resultRecordId);
FlowRecord lastFlowRecordNoStatus = flowRecordService.selectLastFlowNoStatusRecordByRecordId(resultRecordId);
// 如果上一步是开始，则不进行修改，如果上一步是确认中，改成提交，如果上一点是审批中，将上一步改成通过 // 如果上一步是开始，则不进行修改，如果上一步是确认中，改成提交，如果上一点是审批中，将上一步改成通过
if (lastFlowRecordNoStatus != null) { if (lastFlowRecordNoStatus != null) {
if (!StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.START.getName()) if (!StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.START.getName())
&& !StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.CONFIRM.getName())) { && !StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.CONFIRM.getName())) {
lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.APPROVAL.getName()); lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.APPROVAL.getName());
lastFlowRecordNoStatus.setGmtCreate(new Date());
} else if (StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.CONFIRM.getName())) { } else if (StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.CONFIRM.getName())) {
lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.COMMIT.getName()); lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.COMMIT.getName());
lastFlowRecordNoStatus.setGmtCreate(new Date());
} }
flowRecordService.updateFlowRecordById(lastFlowRecordNoStatus); flowRecordService.updateFlowRecordById(lastFlowRecordNoStatus);
} }
@ -544,6 +546,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
FlowRecord lastFlowRecordNoStatus = flowRecordService.selectLastFlowNoStatusRecordByRecordId(req.getRecordResultId()); FlowRecord lastFlowRecordNoStatus = flowRecordService.selectLastFlowNoStatusRecordByRecordId(req.getRecordResultId());
lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.REJECT.getName()); lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.REJECT.getName());
lastFlowRecordNoStatus.setGmtCreate(new Date()); //更新驳回时间
flowRecordService.updateFlowRecordById(lastFlowRecordNoStatus); flowRecordService.updateFlowRecordById(lastFlowRecordNoStatus);
// 可能会被删除 // 可能会被删除