From 1ace707872dbf0253ab34734d6ba429508d5ae6c Mon Sep 17 00:00:00 2001
From: pengqiang <1067496116@qq.com>
Date: Fri, 23 Dec 2022 18:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=92=8C=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/cn/palmte/work/service/ActListenerService.java | 9 ++++++---
.../java/cn/palmte/work/service/ActTaskDefService.java | 5 ++++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cn/palmte/work/service/ActListenerService.java b/src/main/java/cn/palmte/work/service/ActListenerService.java
index 195609c..bdbd5cc 100644
--- a/src/main/java/cn/palmte/work/service/ActListenerService.java
+++ b/src/main/java/cn/palmte/work/service/ActListenerService.java
@@ -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);
}
diff --git a/src/main/java/cn/palmte/work/service/ActTaskDefService.java b/src/main/java/cn/palmte/work/service/ActTaskDefService.java
index 611cc95..0df63e0 100644
--- a/src/main/java/cn/palmte/work/service/ActTaskDefService.java
+++ b/src/main/java/cn/palmte/work/service/ActTaskDefService.java
@@ -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);