mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

注释

master
xxssyyyyssxx 2021-11-12 15:19:10 +08:00
parent 440731dd67
commit 4ed32b4e2c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -158,7 +158,7 @@ public class ProjectService {
if(null != p.getApproveStatusEstimate() && if(null != p.getApproveStatusEstimate() &&
ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == p.getApproveStatusEstimate()){ ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == p.getApproveStatusEstimate()){
//审核不通过的情况下重新编辑后就完成当前任务 //审核不通过的情况下重新编辑后就完成当前任务【此时任务节点在第一个，也就是发起审批】
List<String> estimateProcessInsIds = projectInstanceService.getEstimateProcessInsIds(p); List<String> estimateProcessInsIds = projectInstanceService.getEstimateProcessInsIds(p);
if(CollectionUtil.isNotEmpty(estimateProcessInsIds)){ if(CollectionUtil.isNotEmpty(estimateProcessInsIds)){
actTaskDefService.completeTaskByProcInsId(estimateProcessInsIds.get(0), actTaskDefService.completeTaskByProcInsId(estimateProcessInsIds.get(0),
@ -166,7 +166,7 @@ public class ProjectService {
"重新修改了概算表，请审批"); "重新修改了概算表，请审批");
} }
}else { }else {
//第一次或者重新发起一个流程实例 //第一次或者重新发起一个流程实例【第一次或者以前的审批都已经过了】
projectInstanceService.startEstimateProcessInstance(p, admin); projectInstanceService.startEstimateProcessInstance(p, admin);
} }
return p; return p;