From e263e6eb4cc5ea78c00a1e64c83350011d55e0d9 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 6 Aug 2026 18:59:03 +0800 Subject: [PATCH] =?UTF-8?q?refactor(inspectimprove):=20=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=B7=A1=E8=A7=86=E6=95=B4=E6=94=B9=E4=BB=A3=E7=A0=81=E5=8C=85?= =?UTF-8?q?=20inspectimprove=20=E5=88=B0=20dqinspecttask?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 统一包名与模块目录 dqinspecttask 一致，同步更新 package 声明与 import 引用。 --- .../config/InspectCloseoutConfig.java | 2 +- .../config/InspectImproveConfig.java | 2 +- .../constant/InspectCloseoutConstant.java | 2 +- .../constant/InspectConstant.java | 2 +- .../flow/InspectCloseoutFlow.java | 6 +++--- .../flow/InspectImproveFlow.java | 6 +++--- .../listener/AfterCloseoutApprovedListener.java | 4 ++-- .../listener/AfterDqLeaderApproveListener.java | 6 +++--- .../listener/AfterImplDeptLeaderApproveListener.java | 6 +++--- .../listener/AfterMeasureResLeaderStoreListener.java | 4 ++-- .../listener/DqInspectTaskStageIncrementListener.java | 4 ++-- .../listener/LeaderApproveHelper.java | 2 +- .../InspectCloseoutFlowTest.java | 8 ++++---- .../InspectImproveFlowTest.java | 10 +++++----- .../listener/AfterCloseoutApprovedListenerTest.java | 6 +++--- .../listener/AfterDqLeaderApproveListenerTest.java | 4 ++-- .../AfterImplDeptLeaderApproveListenerTest.java | 4 ++-- .../AfterMeasureResLeaderStoreListenerTest.java | 6 +++--- .../listener/LeaderApproveHelperTest.java | 2 +- 19 files changed, 43 insertions(+), 43 deletions(-) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/config/InspectCloseoutConfig.java (94%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/config/InspectImproveConfig.java (95%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/constant/InspectCloseoutConstant.java (57%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/constant/InspectConstant.java (91%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/flow/InspectCloseoutFlow.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/flow/InspectImproveFlow.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/AfterCloseoutApprovedListener.java (90%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/AfterDqLeaderApproveListener.java (81%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/AfterImplDeptLeaderApproveListener.java (81%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/AfterMeasureResLeaderStoreListener.java (94%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/DqInspectTaskStageIncrementListener.java (93%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/LeaderApproveHelper.java (93%) rename jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/InspectCloseoutFlowTest.java (96%) rename jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/InspectImproveFlowTest.java (97%) rename jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/AfterCloseoutApprovedListenerTest.java (88%) rename jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/AfterDqLeaderApproveListenerTest.java (89%) rename jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/AfterImplDeptLeaderApproveListenerTest.java (89%) rename jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/AfterMeasureResLeaderStoreListenerTest.java (93%) rename jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/{inspectimprove => dqinspecttask}/listener/LeaderApproveHelperTest.java (96%) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/config/InspectCloseoutConfig.java similarity index 94% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/config/InspectCloseoutConfig.java index f285ca1..290e271 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/config/InspectCloseoutConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove.config; +package org.jeecg.modules.supervision.dqinspecttask.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/config/InspectImproveConfig.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/config/InspectImproveConfig.java index 0652dd3..baf62e1 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/config/InspectImproveConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove.config; +package org.jeecg.modules.supervision.dqinspecttask.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/constant/InspectCloseoutConstant.java similarity index 57% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/constant/InspectCloseoutConstant.java index 1fe0ac3..426dd11 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/constant/InspectCloseoutConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove.constant; +package org.jeecg.modules.supervision.dqinspecttask.constant; public class InspectCloseoutConstant { public static final int ZERO_INDEX = 0; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/constant/InspectConstant.java similarity index 91% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/constant/InspectConstant.java index 17f41c3..cde7138 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/constant/InspectConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove.constant; +package org.jeecg.modules.supervision.dqinspecttask.constant; import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/flow/InspectCloseoutFlow.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/flow/InspectCloseoutFlow.java index 078a4a9..dec4b18 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/flow/InspectCloseoutFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove.flow; +package org.jeecg.modules.supervision.dqinspecttask.flow; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; @@ -6,8 +6,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; 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.modules.supervision.dqinspecttask.constant.InspectCloseoutConstant; +import org.jeecg.modules.supervision.dqinspecttask.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; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/flow/InspectImproveFlow.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/flow/InspectImproveFlow.java index 654caf3..a4cc903 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/flow/InspectImproveFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove.flow; +package org.jeecg.modules.supervision.dqinspecttask.flow; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; @@ -8,8 +8,8 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; 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.modules.supervision.dqinspecttask.constant.InspectConstant; +import org.jeecg.modules.supervision.dqinspecttask.config.InspectImproveConfig; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterCloseoutApprovedListener.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterCloseoutApprovedListener.java index 12573f7..fa70cb7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterCloseoutApprovedListener.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.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.supervision.inspectimprove.config.InspectCloseoutConfig; +import org.jeecg.modules.supervision.dqinspecttask.config.InspectCloseoutConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterDqLeaderApproveListener.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterDqLeaderApproveListener.java index 829f390..ffdf846 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterDqLeaderApproveListener.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.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.modules.supervision.inspectimprove.constant.InspectConstant; -import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.constant.InspectConstant; +import org.jeecg.modules.supervision.dqinspecttask.config.InspectImproveConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterImplDeptLeaderApproveListener.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterImplDeptLeaderApproveListener.java index 8a847b8..eff06bc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterImplDeptLeaderApproveListener.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.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.modules.supervision.inspectimprove.constant.InspectConstant; -import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.constant.InspectConstant; +import org.jeecg.modules.supervision.dqinspecttask.config.InspectImproveConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterMeasureResLeaderStoreListener.java similarity index 94% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterMeasureResLeaderStoreListener.java index bf67bf2..b603c1b 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterMeasureResLeaderStoreListener.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.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.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.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; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/DqInspectTaskStageIncrementListener.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/DqInspectTaskStageIncrementListener.java index eb36cc6..4b999cb 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/DqInspectTaskStageIncrementListener.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.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.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.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; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/LeaderApproveHelper.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/LeaderApproveHelper.java index 0d79a77..7d3d4ce 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/listener/LeaderApproveHelper.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.listener; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/InspectCloseoutFlowTest.java similarity index 96% rename from jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/InspectCloseoutFlowTest.java index 1159eb4..7f90e64 100644 --- a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/InspectCloseoutFlowTest.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove; +package org.jeecg.modules.supervision.dqinspecttask; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; @@ -7,9 +7,9 @@ import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; import org.jeecg.modules.supervision.common.OrgConfig; import org.jeecg.common.system.api.ISysBaseAPI; -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.jeecg.modules.supervision.dqinspecttask.config.InspectCloseoutConfig; +import org.jeecg.modules.supervision.dqinspecttask.config.InspectCloseoutConfig.InspectCloseoutProperties; +import org.jeecg.modules.supervision.dqinspecttask.flow.InspectCloseoutFlow; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/InspectImproveFlowTest.java similarity index 97% rename from jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/InspectImproveFlowTest.java index 47b1b9d..a48bccd 100644 --- a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/InspectImproveFlowTest.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove; +package org.jeecg.modules.supervision.dqinspecttask; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; @@ -9,10 +9,10 @@ import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; import org.jeecg.modules.supervision.common.OrgConfig; import org.jeecg.common.system.api.ISysBaseAPI; -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.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.config.InspectImproveConfig.InspectImproveProperties; +import org.jeecg.modules.supervision.dqinspecttask.constant.InspectConstant; +import org.jeecg.modules.supervision.dqinspecttask.flow.InspectImproveFlow; import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; import org.junit.jupiter.api.BeforeEach; diff --git a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterCloseoutApprovedListenerTest.java similarity index 88% rename from jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterCloseoutApprovedListenerTest.java index 4462fd4..2041493 100644 --- a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterCloseoutApprovedListenerTest.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.listener; import static org.mockito.Mockito.*; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig; -import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig.InspectCloseoutProperties; +import org.jeecg.modules.supervision.dqinspecttask.config.InspectCloseoutConfig; +import org.jeecg.modules.supervision.dqinspecttask.config.InspectCloseoutConfig.InspectCloseoutProperties; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterDqLeaderApproveListenerTest.java similarity index 89% rename from jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterDqLeaderApproveListenerTest.java index f288b5d..c1b1ecc 100644 --- a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterDqLeaderApproveListenerTest.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.listener; import static org.mockito.Mockito.*; import org.flowable.engine.RuntimeService; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.dqinspecttask.constant.InspectConstant; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterImplDeptLeaderApproveListenerTest.java similarity index 89% rename from jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterImplDeptLeaderApproveListenerTest.java index 9c0f159..6afc056 100644 --- a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterImplDeptLeaderApproveListenerTest.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.listener; import static org.mockito.Mockito.*; import org.flowable.engine.RuntimeService; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.dqinspecttask.constant.InspectConstant; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterMeasureResLeaderStoreListenerTest.java similarity index 93% rename from jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterMeasureResLeaderStoreListenerTest.java index 0b957f4..ff8367c 100644 --- a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/AfterMeasureResLeaderStoreListenerTest.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.listener; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; -import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties; +import org.jeecg.modules.supervision.dqinspecttask.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.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; diff --git a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/LeaderApproveHelperTest.java similarity index 96% rename from jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/LeaderApproveHelperTest.java index 2288f76..80c58f7 100644 --- a/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/dqinspecttask/listener/LeaderApproveHelperTest.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.supervision.inspectimprove.listener; +package org.jeecg.modules.supervision.dqinspecttask.listener; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*;