diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 19da4c3f..8a2cb5e3 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -759,11 +759,20 @@ public class ResultRecordController extends AbstractController { boolean isSetKeyResult = false; List flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(dto.getId(), 2); if(flowRecords.size() > 0){ - if(flowRecords.get(0).getFlowProcess().intValue() < 2){//因为先提交流程在保存,所以这里写了小于2 - //指定目标中 - log.info("制定目标中"); - isSetKeyResult = true; + if(dto.getSave() != null && dto.getSave().intValue() ==1){ + if(flowRecords.get(0).getFlowProcess().intValue() < 1){//因为先提交流程在保存,所以这里写了小于2 + //指定目标中 + log.info("暂存制定目标中"); + isSetKeyResult = true; + } + }else{ + if(flowRecords.get(0).getFlowProcess().intValue() < 2){//因为先提交流程在保存,所以这里写了小于2 + //指定目标中 + log.info("制定目标中"); + isSetKeyResult = true; + } } + } diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index 58648fbf..fa661127 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -42,6 +42,9 @@ public class ResultRecordDetailDto { @ApiModelProperty(value = "任务id", name = "startId") private Long startId; + @ApiModelProperty(value = "暂存", name = "save") + private Integer save; + //使用的哪个等级。等级组id,lz_result_grade的group_id