sz-team/supervision-test-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(supervision): 迁移 jeecg-module-flow 流程逻辑到 supervision 模块

Browse Source
This commit is contained in:
wsm
2026-08-06 14:52:47 +08:00
parent f849a2f049
commit 6f7e4c8587
35 changed files with 131 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/OrgConfig.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/OrgConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg;
package org.jeecg.modules.supervision.common;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConfig.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.inspectcloseout;
package org.jeecg.modules.supervision.inspectimprove.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveConfig.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.inspectimprove;
package org.jeecg.modules.supervision.inspectimprove.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConstant.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.inspectcloseout;
package org.jeecg.modules.supervision.inspectimprove.constant;
public class InspectCloseoutConstant {
public static final int ZERO_INDEX = 0;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectConstant.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.jeecg.inspectimprove;
package org.jeecg.modules.supervision.inspectimprove.constant;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
public class InspectConstant {
public static final String NEED_APPROVE_STR = "1";
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutFlow.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java
+4 -2
View File
@@ -1,11 +1,13 @@
package org.jeecg.inspectcloseout;
package org.jeecg.modules.supervision.inspectimprove.flow;
import com.alibaba.fastjson.JSONObject;
import com.jeecg.weibo.exception.BusinessException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.jeecg.OrgConfig;
import org.jeecg.modules.supervision.common.OrgConfig;
import org.jeecg.modules.supervision.inspectimprove.constant.InspectCloseoutConstant;
import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression;
import org.springframework.beans.factory.annotation.Autowired;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveFlow.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java
+8 -6
View File
@@ -1,4 +1,4 @@
package org.jeecg.inspectimprove;
package org.jeecg.modules.supervision.inspectimprove.flow;
import com.alibaba.fastjson.JSONObject;
import com.jeecg.weibo.exception.BusinessException;
@@ -7,12 +7,14 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;
import org.jeecg.OrgConfig;
import org.jeecg.modules.supervision.common.OrgConfig;
import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove;
import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove;
import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService;
import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java
+2 -2
View File
@@ -1,10 +1,10 @@
package org.jeecg.inspectcloseout.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.inspectcloseout.InspectCloseoutConfig;
import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java
+4 -4
View File
@@ -1,12 +1,12 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import lombok.RequiredArgsConstructor;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.inspectimprove.InspectConstant;
import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService;
import org.jeecg.inspectimprove.InspectImproveConfig;
import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant;
import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java
+4 -4
View File
@@ -1,12 +1,12 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import lombok.RequiredArgsConstructor;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.inspectimprove.InspectConstant;
import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService;
import org.jeecg.inspectimprove.InspectImproveConfig;
import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant;
import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListener.java
+4 -4
View File
@@ -1,12 +1,12 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove;
import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService;
import org.jeecg.inspectimprove.InspectImproveConfig;
import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove;
import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java
+4 -4
View File
@@ -1,13 +1,13 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.inspectimprove.InspectImproveConfig;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/DqInspectTaskStageIncrementListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java
+4 -4
View File
@@ -1,13 +1,13 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.ExecutionListener;
import org.jeecg.inspectimprove.InspectImproveConfig;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/LeaderApproveHelper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakConfig.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeak;
package org.jeecg.modules.supervision.xispeak.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackConfig.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakFeedbackConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeakfb;
package org.jeecg.modules.supervision.xispeak.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackFlow.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFeedbackFlow.java
+7 -6
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeakfb;
package org.jeecg.modules.supervision.xispeak.flow;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -8,13 +8,14 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;
import org.jeecg.OrgConfig;
import org.jeecg.modules.supervision.common.OrgConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakFeedbackConfig;
import org.jeecg.common.constant.SymbolConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.tasktask.entity.TaskTask;
import org.jeecg.modules.tasktask.service.ITaskTaskService;
import org.springframework.beans.factory.annotation.Autowired;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakFlow.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFlow.java
+6 -5
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeak;
package org.jeecg.modules.supervision.xispeak.flow;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -8,12 +8,13 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.util.StringUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;
import org.jeecg.OrgConfig;
import org.jeecg.modules.supervision.common.OrgConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig;
import org.jeecg.common.constant.SymbolConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgLeaderApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgLeaderApproveListener.java
+5 -5
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeak.listener;
package org.jeecg.modules.supervision.xispeak.listener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
@@ -6,9 +6,9 @@ import org.apache.commons.lang.StringUtils;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.engine.runtime.Execution;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression;
import lombok.RequiredArgsConstructor;
import org.flowable.engine.RuntimeService;
@@ -18,7 +18,7 @@ import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals;
import org.jeecg.modules.tasktask.entity.TaskTask;
import org.jeecg.modules.tasktask.service.ITaskTaskService;
import org.jeecg.xispeak.XiSpeakConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgWorkerFinalApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgWorkerFinalApproveListener.java
+5 -5
View File
@@ -1,14 +1,14 @@
package org.jeecg.xispeak.listener;
package org.jeecg.modules.supervision.xispeak.listener;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.modules.bg.xispeak.constant.XiSpeakConstant;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.supervision.xispeak.constant.XiSpeakConstant;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService;
import lombok.RequiredArgsConstructor;
import org.jeecg.xispeak.XiSpeakConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/listener/AfterImplDeptLeaderApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveFeedbackListener.java
+10 -10
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeakfb.listener;
package org.jeecg.modules.supervision.xispeak.listener;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -6,17 +6,17 @@ import org.apache.commons.lang.StringUtils;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakFeedbackService;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.tasktask.constant.FlowConstants;
import org.jeecg.modules.tasktask.entity.TaskTask;
import org.jeecg.modules.tasktask.service.ITaskTaskService;
import org.jeecg.xispeak.XiSpeakConfig;
import org.jeecg.xispeakfb.XiSpeakFeedbackConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakFeedbackConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +26,7 @@ import java.util.*;
@Slf4j
@Component("AfterImplDeptLeaderApproveFeedbackListener")
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class AfterImplDeptLeaderApproveListener implements TaskListener {
public class AfterImplDeptLeaderApproveFeedbackListener implements TaskListener {
private static final long serialVersionUID = 1L;
private final XiSpeakFeedbackConfig xiSpeakFeedbackConfig;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveListener.java
+5 -5
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeak.listener;
package org.jeecg.modules.supervision.xispeak.listener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
@@ -7,9 +7,9 @@ import org.flowable.engine.delegate.TaskListener;
import org.flowable.engine.runtime.Execution;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression;
import lombok.RequiredArgsConstructor;
import org.flowable.engine.RuntimeService;
@@ -19,7 +19,7 @@ import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals;
import org.jeecg.modules.tasktask.entity.TaskTask;
import org.jeecg.modules.tasktask.service.ITaskTaskService;
import org.jeecg.xispeak.XiSpeakConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java
+6 -6
View File
@@ -1,15 +1,15 @@
package org.jeecg.xispeak.listener;
package org.jeecg.modules.supervision.xispeak.listener;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.flowable.task.service.delegate.DelegateTask;
import org.flowable.engine.delegate.TaskListener; // 🎯 1. 必须引入标准接口
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService;
import org.jeecg.xispeak.XiSpeakConfig;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerApproveListener.java
+6 -6
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeak.listener;
package org.jeecg.modules.supervision.xispeak.listener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
@@ -6,10 +6,10 @@ import org.apache.commons.lang.StringUtils;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.engine.runtime.Execution;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression;
import lombok.RequiredArgsConstructor;
import org.flowable.engine.RuntimeService;
@@ -19,7 +19,7 @@ import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals;
import org.jeecg.modules.tasktask.entity.TaskTask;
import org.jeecg.modules.tasktask.service.ITaskTaskService;
import org.jeecg.xispeak.XiSpeakConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerTemStoreListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerTemStoreListener.java
+5 -5
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeak.listener;
package org.jeecg.modules.supervision.xispeak.listener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
@@ -7,9 +7,9 @@ import org.flowable.engine.delegate.TaskListener;
import org.flowable.engine.runtime.Execution;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService;
import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression;
import lombok.RequiredArgsConstructor;
import org.flowable.engine.RuntimeService;
@@ -19,7 +19,7 @@ import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals;
import org.jeecg.modules.tasktask.entity.TaskTask;
import org.jeecg.modules.tasktask.service.ITaskTaskService;
import org.jeecg.xispeak.XiSpeakConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterSDWApproveHqListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterSDWApproveHqListener.java
+2 -2
View File
@@ -1,4 +1,4 @@
package org.jeecg.xispeak.listener;
package org.jeecg.modules.supervision.xispeak.listener;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression;
@@ -8,7 +8,7 @@ import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.ExecutionListener;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals;
import org.jeecg.xispeak.XiSpeakConfig;
import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-boot-module/jeecg-module-flow/src/main/resources/application-flow.yml → jeecg-module-supervision/src/main/resources/application-flow.yml
View File
jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/InspectCloseoutFlowTest.java → jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java
+5 -3
View File
@@ -1,13 +1,15 @@
package org.jeecg.inspectcloseout;
package org.jeecg.modules.supervision.inspectimprove;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import com.alibaba.fastjson.JSONObject;
import com.jeecg.weibo.exception.BusinessException;
import org.jeecg.OrgConfig;
import org.jeecg.modules.supervision.common.OrgConfig;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.inspectcloseout.InspectCloseoutConfig.InspectCloseoutProperties;
import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig;
import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig.InspectCloseoutProperties;
import org.jeecg.modules.supervision.inspectimprove.flow.InspectCloseoutFlow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/InspectImproveFlowTest.java → jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java
+8 -5
View File
@@ -1,4 +1,4 @@
package org.jeecg.inspectimprove;
package org.jeecg.modules.supervision.inspectimprove;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -7,11 +7,14 @@ import com.alibaba.fastjson.JSONObject;
import com.jeecg.weibo.exception.BusinessException;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;
import org.jeecg.OrgConfig;
import org.jeecg.modules.supervision.common.OrgConfig;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.inspectimprove.InspectImproveConfig.InspectImproveProperties;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties;
import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant;
import org.jeecg.modules.supervision.inspectimprove.flow.InspectImproveFlow;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListenerTest.java → jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java
+3 -3
View File
@@ -1,10 +1,10 @@
package org.jeecg.inspectcloseout.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import static org.mockito.Mockito.*;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.inspectcloseout.InspectCloseoutConfig;
import org.jeecg.inspectcloseout.InspectCloseoutConfig.InspectCloseoutProperties;
import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig;
import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig.InspectCloseoutProperties;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java → jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java
+2 -2
View File
@@ -1,10 +1,10 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import static org.mockito.Mockito.*;
import org.flowable.engine.RuntimeService;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.inspectimprove.InspectConstant;
import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java → jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java
+2 -2
View File
@@ -1,10 +1,10 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import static org.mockito.Mockito.*;
import org.flowable.engine.RuntimeService;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.inspectimprove.InspectConstant;
import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java → jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java
+5 -5
View File
@@ -1,12 +1,12 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import static org.mockito.Mockito.*;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.inspectimprove.InspectImproveConfig;
import org.jeecg.inspectimprove.InspectImproveConfig.InspectImproveProperties;
import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove;
import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties;
import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove;
import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java → jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java
+5 -5
View File
@@ -1,13 +1,13 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.inspectimprove.InspectImproveConfig;
import org.jeecg.inspectimprove.InspectImproveConfig.InspectImproveProperties;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig;
import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/LeaderApproveHelperTest.java → jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.inspectimprove.listener;
package org.jeecg.modules.supervision.inspectimprove.listener;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;