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

Merge branch 'master' into version_equipment_20200901

Browse Source
This commit is contained in:
wulin 2020-09-03 17:00:10 +08:00
commit 4d9fd22446
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,13 +432,16 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowRecord.setStatusName(FlowRecordEnum.APPROVALING.getName());
FlowRecord lastFlowRecordNoStatus = flowRecordService.selectLastFlowNoStatusRecordByRecordId(resultRecordId);
// 如果上一步是开始，则不进行修改，如果上一步是确认中，改成提交，如果上一点是审批中，将上一步改成通过
if (lastFlowRecordNoStatus != null
&& !lastFlowRecordNoStatus.getStatusName().equals(FlowRecordEnum.START.getName())) {
lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.APPROVAL.getName());
} else if (lastFlowRecordNoStatus != null
&& lastFlowRecordNoStatus.getStatusName().equals(FlowRecordEnum.CONFIRM.getName())) {
lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.COMMIT.getName());
if (lastFlowRecordNoStatus != null) {
if (!StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.START.getName())
&& !StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.CONFIRM.getName())) {
lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.APPROVAL.getName());
} else if (StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.CONFIRM.getName())) {
lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.COMMIT.getName());
}
flowRecordService.updateFlowRecordById(lastFlowRecordNoStatus);
}
flowRecordService.insertFlowRecord(flowRecord);