审批人和审批状态更新

master
pengqiang 2022-12-23 18:01:08 +08:00
parent 748b26144c
commit 1ace707872
2 changed files with 10 additions and 4 deletions

View File

@ -1,11 +1,11 @@
package cn.palmte.work.service;
import cn.palmte.work.config.activiti.ActConstant;
import cn.palmte.work.config.activiti.ActTaskIndexEnum;
import cn.palmte.work.model.ActTaskDef;
import cn.palmte.work.model.Admin;
import cn.palmte.work.model.AdminRepository;
import cn.palmte.work.model.enums.ProcessStatus;
import cn.palmte.work.utils.ActUtil;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.delegate.DelegateExecution;
@ -43,6 +43,9 @@ public class ActListenerService {
@Autowired
private AdminRepository adminRepository;
@Autowired
ProjectProcessService projectProcessService;
/**
*
*
@ -85,7 +88,7 @@ public class ActListenerService {
String procDefId = processInstance.getProcessDefinitionId();
if (actUtil.isNewProcess(procDefId)) {
logger.info("**** lcjsjt 流程结束监听 更新项目状态为审批通过 **** procInsId:{}, procDefId:{}, projectId:{}", procInsId, procDefId, projectId);
//todo updateNewProcess 更新项目状态为审批通过
projectProcessService.updateProcessStatus(projectId, ProcessStatus.audit_passed);
}
}
@ -113,7 +116,7 @@ public class ActListenerService {
processInstance.getProcessInstanceId(), businessKey, adminId);
projectInstanceService.updateApprover(Integer.parseInt(businessKey), adminId);
} else if (actUtil.isNewProcess(procDefId)) {
//todo updateNewProcess 更新流程审批人
projectProcessService.updateAudit(Integer.parseInt(businessKey), null, enableUsers);
logger.info("**** rwcjjt 任务创建监听 更新审批2 procInsId:{}, projectId:{}, enableUsers:{} **** ",
processInstance.getProcessInstanceId(), businessKey, enableUsers);
}

View File

@ -4,6 +4,7 @@ import cn.palmte.work.bean.ResponseMsg;
import cn.palmte.work.config.activiti.*;
import cn.palmte.work.model.*;
import cn.palmte.work.model.enums.ProcessStatus;
import cn.palmte.work.pojo.ActHisTask;
import cn.palmte.work.utils.ActUtil;
import cn.palmte.work.utils.InterfaceUtil;
@ -44,6 +45,8 @@ public class ActTaskDefService {
private ProjectInstanceService projectInstanceService;
@Autowired
private RuntimeService runtimeService;
@Autowired
private ProjectProcessService projectProcessService;
/**
@ -188,7 +191,7 @@ public class ActTaskDefService {
if (actUtil.isFourcalProcess(processInstance.getProcessDefinitionId())) {
projectInstanceService.updateApproveStatus(projectId, procDefKey, ActApproveTypeEnum.APPROVAL_UN_PASS);
} else if (actUtil.isNewProcess(processInstance.getProcessDefinitionId())) {
//todo updateNewProcess 更新流程状态为不通过
projectProcessService.updateProcessStatus(projectId, ProcessStatus.audit_not_passed);
}
logger.info("updateProjectUnPassed projectId:{}, proDefKey:{}", projectId, procDefKey);