ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 制修订流程结束 驳回待办不消失BUG

Browse Source
This commit is contained in:
mzaxd
2023-12-28 17:54:31 +08:00
parent 231e1061fa
commit 75b334fa32
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+15
View File
@@ -444,6 +444,21 @@ public class ActFlowCommonService {
updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue());
updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName);
updateWrapper.set(ProcessApprovalRecord::getCommitFlag, CommitFlagEnum.UNDISPOSED.getValue());
updateWrapper.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
processApprovalRecordService.update(updateWrapper);
}
/**
* 会签节点驳回后，将其余节点recode设置为 未处理 状态
* @param prcId
* @param nodeName
*/
public void cleanOtherCountersignTask(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::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
processApprovalRecordService.update(updateWrapper);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+7 -3
View File
@@ -245,7 +245,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
List<OtherDraftUserVO> otherDraftUserVOS = data.parseOtherDraftUserVOS();
List<InspectContentVO> inspectContentVOS = data.parseInspectContents();
String xmlNodeId = record.getNodeId();
boolean pass = (boolean) taskService.getVariable(taskId, "pass");
Object passObject = taskService.getVariable(taskId, "pass");
boolean pass = true;
if (passObject != null) {
pass = (boolean) passObject;
}
// 某些节点需要对数据进行特殊处理
switch (xmlNodeId) {
case OTHER_DRAFT_USER_UPLOAD:
@@ -320,6 +324,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
ProcessEsRevision data;
Map<String, Object> flowUser;
String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
// 更新审批表为完成，填充数据
actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass);
switch (xmlNodeId) {
case MAIN_DRAFT_USER_DISTRIBUTE:
// 判断是否分发 设置流程变量
@@ -528,8 +534,6 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
// 设置流程变量
runtimeService.setVariable(processInstanceId, "pass", false);
}
// 更新审批表为完成，填充数据
actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass);
// 审批节点
actFlowCommonService.completeTask(taskId, userId);
}