ci: 删除企标部分会前节点驳回后对其余节点状态的特殊处理 等待统一处理
This commit is contained in:
+6
-7
@@ -437,13 +437,12 @@ public class ActFlowCommonService {
|
||||
* @param nodeName
|
||||
*/
|
||||
public void updateOtherCountersignRecodeStatus(String prcId, String nodeName) {
|
||||
LambdaUpdateWrapper<ProcessApprovalRecord> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId);
|
||||
updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue());
|
||||
updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName);
|
||||
updateWrapper.set(ProcessApprovalRecord::getCommitText, CommitFlagEnum.UNDISPOSED.getName());
|
||||
updateWrapper.set(ProcessApprovalRecord::getFinishFlag, null);
|
||||
processApprovalRecordService.update(updateWrapper);
|
||||
// LambdaUpdateWrapper<ProcessApprovalRecord> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
// updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId);
|
||||
// updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue());
|
||||
// updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName);
|
||||
// updateWrapper.set(ProcessApprovalRecord::getCommitText, CommitFlagEnum.UNDISPOSED.getName());
|
||||
// processApprovalRecordService.update(updateWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+1
-1
@@ -243,7 +243,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
|
||||
actFlowCommonService.removeDraft(commonVO);
|
||||
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
|
||||
if (!pass) {
|
||||
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
|
||||
// actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -249,7 +249,7 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
|
||||
actFlowCommonService.removeDraft(commonVO);
|
||||
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
|
||||
if (!pass) {
|
||||
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
|
||||
// actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -338,7 +338,7 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
|
||||
actFlowCommonService.removeDraft(commonVO);
|
||||
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
|
||||
if (!pass) {
|
||||
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_CHANGE_COUNTER_SIGN_NODE_NAME);
|
||||
// actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_CHANGE_COUNTER_SIGN_NODE_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -245,7 +245,7 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
|
||||
actFlowCommonService.removeDraft(commonVO);
|
||||
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
|
||||
if (!pass) {
|
||||
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
|
||||
// actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -339,10 +339,10 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
|
||||
if (!pass) {
|
||||
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
|
||||
if (taskName.equals(CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME)) {
|
||||
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME);
|
||||
// actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME);
|
||||
}
|
||||
if (taskName.equals(CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME)) {
|
||||
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
|
||||
// actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -623,19 +623,19 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
|
||||
case OTHER_DRAFT_USER_CHECK:
|
||||
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
|
||||
if (!pass) {
|
||||
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_OTHER_DRAFT_USER_CHECK_NODE_NAME);
|
||||
// actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_OTHER_DRAFT_USER_CHECK_NODE_NAME);
|
||||
}
|
||||
break;
|
||||
case LEADER_APPROVAL:
|
||||
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
|
||||
if (!pass) {
|
||||
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_LEADER_APPROVAL_NODE_NAME);
|
||||
// actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_LEADER_APPROVAL_NODE_NAME);
|
||||
}
|
||||
break;
|
||||
case RELATED_LEADER_APPROVAL:
|
||||
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
|
||||
if (!pass) {
|
||||
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_RELATED_LEADER_APPROVAL_NODE_NAME);
|
||||
// actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_RELATED_LEADER_APPROVAL_NODE_NAME);
|
||||
}
|
||||
break;
|
||||
case MAIN_DRAFT_USER_RELEASE:
|
||||
|
||||
Reference in New Issue
Block a user