继承了流程监听器的修改

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java

@@ -52,6 +52,7 @@ import cn.iocoder.yudao.framework.common.util.elasticsearch.EsearchUtils;
 public class KnowledgeServiceImpl implements KnowledgeService {
 //    public static final String PROCESS_KEY = "pch-qjgl-001";
     public static  String PROCESS_KEY ="";
+    public static  String processInstanceId ="";
     @Resource
     private KnowledgeMapper knowledgeMapper;
     @Resource
@@ -81,7 +82,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         createCommentList(knowledge.getId(), createReqVO.getComments());
         // 发起 BPM 流程
         Map<String, Object> processInstanceVariables = new HashMap<>();
-        String processInstanceId = processInstanceApi.createProcessInstance(userId,
+        processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
                         .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(knowledge.getId()))
                         .setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees()));

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/listener/BpmKnowledgeStatusListener.java

@@ -24,6 +24,11 @@ public class BpmKnowledgeStatusListener extends BpmProcessInstanceStatusEventLis
         return KnowledgeServiceImpl.PROCESS_KEY;
     }
 
+    @Override
+    protected String getProcessInstanceId() {
+        return KnowledgeServiceImpl.processInstanceId;
+    }
+
     @Override
     protected void onEvent(BpmProcessInstanceStatusEvent event) {
         knowledgeService.updateKnowledgeStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java

@@ -35,6 +35,7 @@ public class BpmOALeaveServiceImpl implements BpmOALeaveService {
      * OA 请假对应的流程定义 KEY
      */
     public static final String PROCESS_KEY = "pch-qjgl-001";
+    public static String processInstanceId = "";
 
     @Resource
     private BpmOALeaveMapper leaveMapper;
@@ -54,7 +55,7 @@ public class BpmOALeaveServiceImpl implements BpmOALeaveService {
         // 发起 BPM 流程
         Map<String, Object> processInstanceVariables = new HashMap<>();
         processInstanceVariables.put("day", day);
-        String processInstanceId = processInstanceApi.createProcessInstance(userId,
+        processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
                         .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(leave.getId()))
                         .setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees()));

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOALeaveStatusListener.java

@@ -24,6 +24,11 @@ public class BpmOALeaveStatusListener extends BpmProcessInstanceStatusEventListe
         return BpmOALeaveServiceImpl.PROCESS_KEY;
     }
 
+    @Override
+    protected String getProcessInstanceId() {
+        return BpmOALeaveServiceImpl.processInstanceId;
+    }
+
     @Override
     protected void onEvent(BpmProcessInstanceStatusEvent event) {
         leaveService.updateLeaveStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/BgypServiceImpl.java

@@ -34,6 +34,7 @@ import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*;
 public class BgypServiceImpl implements BgypService {
 //    public static final String PROCESS_KEY = "bgyp-001";
     public static String PROCESS_KEY = "";
+    public static String processInstanceId = "";
 
     @Resource
     private BgypMapper bgypMapper;
@@ -60,7 +61,7 @@ public class BgypServiceImpl implements BgypService {
         bgypMapper.insert(bgyp);
         // 发起 BPM 流程
         Map<String, Object> processInstanceVariables = new HashMap<>();
-        String processInstanceId = processInstanceApi.createProcessInstance(userId,
+        processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
                         .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(bgyp.getId()))
                         .setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees()));

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/bgyp/listener/BpmBgypStatusListener.java

@@ -19,6 +19,11 @@ public class BpmBgypStatusListener extends BpmProcessInstanceStatusEventListener
         return BgypServiceImpl.PROCESS_KEY;
     }
 
+    @Override
+    protected String getProcessInstanceId() {
+        return BgypServiceImpl.processInstanceId;
+    }
+
     @Override
     protected void onEvent(BpmProcessInstanceStatusEvent event) {
         bgypService.updateBgypStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java

@@ -34,6 +34,7 @@ import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*;
 public class ClglServiceImpl implements ClglService {
 //    public static final String PROCESS_KEY = "car-001";
     public static String PROCESS_KEY = "";
+    public static String processInstanceId = "";
 
     @Resource
     private ClglMapper clglMapper;
@@ -52,7 +53,7 @@ public class ClglServiceImpl implements ClglService {
 
         // 发起 BPM 流程
         Map<String, Object> processInstanceVariables = new HashMap<>();
-        String processInstanceId = processInstanceApi.createProcessInstance(userId,
+        processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
                         .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(clgl.getId()))
                         .setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees()));

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/listener/BpmClglStatusListener.java

@@ -18,6 +18,11 @@ public class BpmClglStatusListener extends BpmProcessInstanceStatusEventListener
         return ClglServiceImpl.PROCESS_KEY;
     }
 
+    @Override
+    protected String getProcessInstanceId() {
+        return ClglServiceImpl.processInstanceId;
+    }
+
     @Override
     protected void onEvent(BpmProcessInstanceStatusEvent event) {
         clglService.updateClglStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/hygl/listener/BpmHyglStatusListener.java

@@ -4,7 +4,6 @@ import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEvent;
 import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEventListener;
 import cn.iocoder.yudao.module.home.service.hygl.HyglService;
 import cn.iocoder.yudao.module.home.service.hygl.HyglServiceImpl;
-import cn.iocoder.yudao.module.home.service.kqgl.KqglServiceImpl;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -21,7 +20,7 @@ public class BpmHyglStatusListener extends BpmProcessInstanceStatusEventListener
 
     @Override
     protected String getProcessInstanceId(){
-        return KqglServiceImpl.processInstanceId;
+        return HyglServiceImpl.processInstanceId;
     }
     @Override
     protected void onEvent(BpmProcessInstanceStatusEvent event) {

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/listener/BpmJbglStatusListener.java

@@ -2,12 +2,8 @@ package cn.iocoder.yudao.module.home.service.jbgl.listener;
 
 import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEvent;
 import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEventListener;
-import cn.iocoder.yudao.module.home.dal.mysql.jbgl.JbglMapper;
-import cn.iocoder.yudao.module.home.service.clgl.ClglService;
-import cn.iocoder.yudao.module.home.service.clgl.ClglServiceImpl;
 import cn.iocoder.yudao.module.home.service.jbgl.JbglService;
 import cn.iocoder.yudao.module.home.service.jbgl.JbglServiceImpl;
-import cn.iocoder.yudao.module.home.service.kqgl.KqglServiceImpl;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -25,7 +21,7 @@ public class BpmJbglStatusListener extends BpmProcessInstanceStatusEventListener
 
     @Override
     protected String getProcessInstanceId(){
-        return KqglServiceImpl.processInstanceId;
+        return JbglServiceImpl.processInstanceId;
     }
     @Override
     protected void onEvent(BpmProcessInstanceStatusEvent event) {

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/qjgl/QjglServiceImpl.java

@@ -31,6 +31,7 @@ import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*;
 public class QjglServiceImpl implements QjglService {
 
     public static  String PROCESS_KEY = "";
+    public static  String processInstanceId = "";
     @Resource
     private QjglMapper qjglMapper;
 
@@ -49,7 +50,7 @@ public class QjglServiceImpl implements QjglService {
 
         // 发起 BPM 流程
         Map<String, Object> processInstanceVariables = new HashMap<>();
-        String processInstanceId = processInstanceApi.createProcessInstance(userId,
+        processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
                         .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(qjgl.getId()))
                         .setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees()));

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/qjgl/listener/QjglStatusListener.java

@@ -24,6 +24,11 @@ public class QjglStatusListener extends BpmProcessInstanceStatusEventListener {
         return QjglServiceImpl.PROCESS_KEY;
     }
 
+    @Override
+    protected String getProcessInstanceId() {
+        return QjglServiceImpl.processInstanceId;
+    }
+
     @Override
     protected void onEvent(BpmProcessInstanceStatusEvent event) {
         qjglService.updateQjglStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());