diff --git a/src/main/java/neatlogic/module/process/api/catalog/CalalogBreadcrumbSearchApi.java b/src/main/java/neatlogic/module/process/api/catalog/CalalogBreadcrumbSearchApi.java index 99d1eb457caf473dd0dc93c4cb09fc54f6af9ac5..afd05ba9553c9a3793ccefcfe45605dbfe4f1e54 100644 --- a/src/main/java/neatlogic/module/process/api/catalog/CalalogBreadcrumbSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CalalogBreadcrumbSearchApi.java @@ -7,8 +7,8 @@ import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.exception.catalog.CatalogNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelGetApi.java b/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelGetApi.java index dd155fc483dae1fc75d251934b101d2d901c8cb0..22a3dcc3c058ed47fdbef63539e4339197a61115 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelGetApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelGetApi.java @@ -15,8 +15,8 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.common.util.PageUtil; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelSearchApi.java b/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelSearchApi.java index 637536cd78b544de03afd9b39128298c1252cc16..b3961a36ec032a9412709e7fcb5bbd9ff9b14184 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelSearchApi.java @@ -7,8 +7,8 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelSearchForMobileApi.java b/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelSearchForMobileApi.java index cf5e2388d97669a6c24d5cd8da337e732386ffd4..ea75884b3b07a73eaa22e9ed4d46ddde5d449fdd 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelSearchForMobileApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelSearchForMobileApi.java @@ -13,8 +13,8 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.exception.catalog.CatalogNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelTreeSearchApi.java b/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelTreeSearchApi.java index 263496c4158bb4f9f4c6f59a2b81cc43e32e6382..67c0de0ed21e55c363b0027090dbbe46138ea81b 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelTreeSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CatalogChannelTreeSearchApi.java @@ -4,20 +4,19 @@ import java.util.*; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.module.process.service.CatalogService; diff --git a/src/main/java/neatlogic/module/process/api/catalog/CatalogDeteleApi.java b/src/main/java/neatlogic/module/process/api/catalog/CatalogDeteleApi.java index d32e9cb9581fbbab3e732db73d4407481f708408..0b8e8bdf3effa412cf335eb4a53454d25995d656 100644 --- a/src/main/java/neatlogic/module/process/api/catalog/CatalogDeteleApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CatalogDeteleApi.java @@ -3,8 +3,8 @@ package neatlogic.module.process.api.catalog; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.lrcode.LRCodeManager; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.exception.catalog.CatalogIllegalParameterException; diff --git a/src/main/java/neatlogic/module/process/api/catalog/CatalogGetApi.java b/src/main/java/neatlogic/module/process/api/catalog/CatalogGetApi.java index 4e34cd18975360cb138eac62b06e97a2d1c33aee..9c0e391354fda9d4ebee2c098b1ad51171b9bf72 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/CatalogGetApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CatalogGetApi.java @@ -15,7 +15,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.dto.AuthorityVo; -import neatlogic.framework.process.dao.mapper.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.exception.catalog.CatalogNotFoundEditTargetException; diff --git a/src/main/java/neatlogic/module/process/api/catalog/CatalogMoveApi.java b/src/main/java/neatlogic/module/process/api/catalog/CatalogMoveApi.java index 5d2a87b3d381f66a9983ef48ab318f713bce9572..c286a9c731d5e846c0d17a35b9d9b90edd0e8fe4 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/CatalogMoveApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CatalogMoveApi.java @@ -21,7 +21,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.lrcode.LRCodeManager; import neatlogic.framework.lrcode.constvalue.MoveType; import neatlogic.framework.process.auth.CATALOG_MODIFY; -import neatlogic.framework.process.dao.mapper.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.exception.catalog.CatalogNameRepeatException; import neatlogic.framework.restful.annotation.Description; diff --git a/src/main/java/neatlogic/module/process/api/catalog/CatalogSaveApi.java b/src/main/java/neatlogic/module/process/api/catalog/CatalogSaveApi.java index 3ddfdc5f587d9e3fff85498b7990ca8e4b12de38..b563bded6b0be1d789f5860b11e32f1683439660 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/CatalogSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CatalogSaveApi.java @@ -6,7 +6,7 @@ import neatlogic.framework.dto.AuthorityVo; import neatlogic.framework.dto.FieldValidResultVo; import neatlogic.framework.lrcode.LRCodeManager; import neatlogic.framework.process.auth.CATALOG_MODIFY; -import neatlogic.framework.process.dao.mapper.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.exception.catalog.CatalogNameRepeatException; import neatlogic.framework.process.exception.catalog.CatalogNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/catalog/CatalogTreeSearchApi.java b/src/main/java/neatlogic/module/process/api/catalog/CatalogTreeSearchApi.java index 91265ded697f4af5afa112056ac5cfe2863371fc..ce22d265f16578cdfec89fc285a78655649ec33e 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/CatalogTreeSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/CatalogTreeSearchApi.java @@ -17,13 +17,11 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.exception.catalog.CatalogNotFoundException; -import javax.annotation.Resource; - @Service @AuthAction(action = PROCESS_BASE.class) @OperationType(type = OperationTypeEnum.SEARCH) diff --git a/src/main/java/neatlogic/module/process/api/catalog/FavoriteChannelListForMobileApi.java b/src/main/java/neatlogic/module/process/api/catalog/FavoriteChannelListForMobileApi.java index 1f138ad7e6860fe1582cc8bffdc915f2afee60dc..91552d33eac29c26301e79bbea4bc03f273499bf 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/FavoriteChannelListForMobileApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/FavoriteChannelListForMobileApi.java @@ -19,7 +19,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/catalog/RebuidLeftRightCodeApi.java b/src/main/java/neatlogic/module/process/api/catalog/RebuidLeftRightCodeApi.java index 8299c65b82bf30fe3caf5085c7428d56defec7e2..c2ed1b247e965ad8bfc1b910c75756a571963fd0 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/RebuidLeftRightCodeApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/RebuidLeftRightCodeApi.java @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; -import neatlogic.framework.process.dao.mapper.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; import neatlogic.framework.process.auth.CATALOG_MODIFY; import neatlogic.module.process.service.CatalogService; diff --git a/src/main/java/neatlogic/module/process/api/catalog/relation/CalalogBreadcrumbApi.java b/src/main/java/neatlogic/module/process/api/catalog/relation/CalalogBreadcrumbApi.java index e3f61fe066fb38ada7938693e73ca55c9e4c52ec..6fe9f53469f1bc18ebae91ceecaa497942773b01 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/relation/CalalogBreadcrumbApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/relation/CalalogBreadcrumbApi.java @@ -6,7 +6,7 @@ import java.util.stream.Collectors; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; @@ -18,8 +18,8 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.common.util.PageUtil; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.exception.catalog.CatalogNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/catalog/relation/CatalogChannelTreeApi.java b/src/main/java/neatlogic/module/process/api/catalog/relation/CatalogChannelTreeApi.java index 180bedf566184f2454f301ef8c5c02493d1ee0d7..d44830f47e38e9555f919ffb1f513b281d8b056a 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/relation/CatalogChannelTreeApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/relation/CatalogChannelTreeApi.java @@ -4,7 +4,7 @@ import java.util.*; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -17,8 +17,8 @@ import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.module.process.service.CatalogService; diff --git a/src/main/java/neatlogic/module/process/api/catalog/relation/CatalogTreeApi.java b/src/main/java/neatlogic/module/process/api/catalog/relation/CatalogTreeApi.java index b0971dad7d79e6634acda16ad32e6f1835200cd5..fe35e4813846479707f5319f81729314fff6b274 100755 --- a/src/main/java/neatlogic/module/process/api/catalog/relation/CatalogTreeApi.java +++ b/src/main/java/neatlogic/module/process/api/catalog/relation/CatalogTreeApi.java @@ -5,7 +5,7 @@ import java.util.*; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -18,8 +18,8 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.exception.catalog.CatalogNotFoundException; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelDeleteApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelDeleteApi.java index b42e73cb2ac0261f5f96b1f16c1d19aca6e57312..ebbb0be6620ad1c684ef9c8c3e98ce039c69c552 100755 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelDeleteApi.java @@ -19,8 +19,8 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.CATALOG_MODIFY; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.exception.channel.ChannelIsReferencedException; import neatlogic.framework.restful.annotation.Description; diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelFormGetApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelFormGetApi.java index 608c308da21e3f36c74c7e255575bd81bb2843b1..f1df005853e61cdf8028f8262fa97bd9336cd72f 100644 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelFormGetApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelFormGetApi.java @@ -26,7 +26,7 @@ import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.form.dto.FormVo; import neatlogic.framework.form.exception.FormNotFoundException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessVo; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; @@ -36,7 +36,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.framework.form.attribute.handler.CheckboxHandler; import neatlogic.module.framework.form.attribute.handler.RadioHandler; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelGetApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelGetApi.java index 90dd74319707f892ed36308bfea9d8ff74b5c03e..3122c595a9ab7e4cdddc7bebd95f1820fd0eae71 100644 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelGetApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelGetApi.java @@ -5,7 +5,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.dto.AuthorityVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelPriorityVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.exception.channel.ChannelNotFoundEditTargetException; diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelMoveApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelMoveApi.java index a467ae1f2621821ff851605430db0198a557d542..ad7ffa611225a9edabe2c7a74dc295b463d17798 100755 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelMoveApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelMoveApi.java @@ -21,8 +21,8 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.lrcode.constvalue.MoveType; import neatlogic.framework.lrcode.exception.MoveTargetNodeIllegalException; import neatlogic.framework.process.auth.CATALOG_MODIFY; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.exception.catalog.CatalogNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelSaveApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelSaveApi.java index 7926df2d45982e7007d0f8e6521c16a7dc932d62..4236b774966daa7023c4e2be8f7155ac9a1079a7 100644 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelSaveApi.java @@ -21,10 +21,10 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.dto.FieldValidResultVo; import neatlogic.framework.process.auth.CATALOG_MODIFY; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.exception.channel.ChannelNameRepeatException; -import neatlogic.framework.process.service.ChannelService; +import neatlogic.module.process.service.ChannelService; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.IValid; diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelSearchApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelSearchApi.java index 68f0f0b6e334478a2f836cc5b3d21bffe81c0705..2d53adff1ddc161e36efa0298f7408e1fb1ae449 100755 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelSearchApi.java @@ -7,7 +7,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -26,7 +26,7 @@ import com.google.common.base.Objects; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.util.PageUtil; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; import neatlogic.framework.process.exception.channeltype.ChannelTypeRelationNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelSearchForSelectApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelSearchForSelectApi.java index 51c3809bb0fb8248788e5c903c42be66a34d6590..b788e34c4cb0c52b6fac59e862b0b01662186f5b 100755 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelSearchForSelectApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelSearchForSelectApi.java @@ -17,7 +17,7 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.common.util.PageUtil; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.Description; diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelTransferReportInfoUpdateApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelTransferReportInfoUpdateApi.java index 68370afce8ac2fd22bd28cd3a7c0887083c6b880..89ca8ebede8ed7e6de68189a523c914027b2a275 100755 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelTransferReportInfoUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelTransferReportInfoUpdateApi.java @@ -2,7 +2,7 @@ package neatlogic.module.process.api.channel; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelRelationVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelUserSaveApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelUserSaveApi.java index 6d7ca1ed015b5cfc90b8932dcffd4a5253dc7b66..250e8846d866cc0fdcca2b69de65ff73f58962c3 100755 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelUserSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelUserSaveApi.java @@ -4,7 +4,7 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeDeleteApi.java b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeDeleteApi.java index 3cdf1351b8d797693842485708538b9b9bf79b41..ee21d1bccad9380aca7ace2cd2d34040257308f7 100755 --- a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeDeleteApi.java @@ -1,6 +1,6 @@ package neatlogic.module.process.api.channeltype; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.exception.channeltype.ChannelTypeHasReferenceException; import neatlogic.framework.restful.constvalue.OperationTypeEnum; @@ -16,7 +16,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.ProcessTaskSerialNumberMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; import neatlogic.framework.process.exception.channeltype.ChannelTypeNotFoundException; @Service diff --git a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeGetApi.java b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeGetApi.java index 8a05b71edef8924180e56edea485a7340fd2f211..85ebf773fdf6a08c59e692cbcd1fab3021a98373 100644 --- a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeGetApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeGetApi.java @@ -2,7 +2,7 @@ package neatlogic.module.process.api.channeltype; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -14,7 +14,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.ProcessTaskSerialNumberMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ProcessTaskSerialNumberPolicyVo; import neatlogic.framework.process.exception.channeltype.ChannelTypeNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSaveApi.java b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSaveApi.java index 1de4df5a474e9622f0004d073e7dc3639ac57dff..c0a621ddd0a9c6a3015c98b85be67b42c654345f 100644 --- a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSaveApi.java @@ -1,7 +1,7 @@ package neatlogic.module.process.api.channeltype; import neatlogic.framework.dto.FieldValidResultVo; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.exception.channeltype.ChannelTypeHasReferenceException; import neatlogic.framework.process.exception.processtaskserialnumberpolicy.ProcessTaskSerialNumberUpdateInProcessException; import neatlogic.framework.restful.constvalue.OperationTypeEnum; @@ -20,7 +20,7 @@ import com.alibaba.fastjson.TypeReference; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.ProcessTaskSerialNumberMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ProcessTaskSerialNumberPolicyVo; import neatlogic.framework.process.exception.channeltype.ChannelTypeNameRepeatException; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSearchApi.java b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSearchApi.java index 48ce588c069210005e6ec65561926dac685b357a..da6acfbd85d73388930a2f77001e889499130977 100755 --- a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSearchApi.java @@ -4,7 +4,7 @@ import java.util.List; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSearchForSelectApi.java b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSearchForSelectApi.java index 8ecf827827e2e5f1432d9cc7383f64f996855109..139401621e6574f0dcaaa0f8632f28dc8df48b10 100755 --- a/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSearchForSelectApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/ChannelTypeSearchForSelectApi.java @@ -5,7 +5,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationDeleteApi.java b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationDeleteApi.java index 2938e076830da3f5cc318411670cccde11342dcb..49978987d03a55ee3a5041715be5e8224746f704 100755 --- a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationDeleteApi.java @@ -1,6 +1,6 @@ package neatlogic.module.process.api.channeltype.relation; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.ChannelTypeRelationVo; import neatlogic.framework.process.exception.channeltype.ChannelTypeRelationHasReferenceException; import neatlogic.framework.process.exception.channeltype.ChannelTypeRelationNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationGetApi.java b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationGetApi.java index c5f127b68a0cbb30741296d127338f52ec6ece48..8bbe22eeac4a672d104f48189b61240445ec4859 100755 --- a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationGetApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationGetApi.java @@ -2,7 +2,7 @@ package neatlogic.module.process.api.channeltype.relation; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationIsActiveUpdateApi.java b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationIsActiveUpdateApi.java index 1e0c53dbd7b93765f4034a927b3835e55674a4d5..55d5514b7c2e19ccab0aa891dafcb9e9f4719cd3 100755 --- a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationIsActiveUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationIsActiveUpdateApi.java @@ -1,6 +1,6 @@ package neatlogic.module.process.api.channeltype.relation; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.exception.channeltype.ChannelTypeRelationHasReferenceException; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationListApi.java b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationListApi.java index 57459b3e93b532e77e302d5f4092dbbb31952d58..536ba100c76949008700f3cdf05e19b0d2a66dc0 100755 --- a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationListApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationListApi.java @@ -2,7 +2,7 @@ package neatlogic.module.process.api.channeltype.relation; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; @@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.common.util.PageUtil; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelTypeRelationChannelVo; import neatlogic.framework.process.dto.ChannelTypeRelationVo; import neatlogic.framework.process.dto.ChannelTypeVo; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationListForSelectApi.java b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationListForSelectApi.java index 36382fa81db1942d101a35037a8e29856869fedf..5264fe18fb10e77d57088df6e4886c6e336e1531 100644 --- a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationListForSelectApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationListForSelectApi.java @@ -4,8 +4,8 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationSaveApi.java b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationSaveApi.java index fdce344e5567ed50f15e715fab11621a2e641e02..4a74f9063db774c7e2bb1fbb8a0533e1c603e160 100755 --- a/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/channeltype/relation/ChannelTypeRelationSaveApi.java @@ -1,7 +1,7 @@ package neatlogic.module.process.api.channeltype.relation; import neatlogic.framework.dto.FieldValidResultVo; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.exception.channeltype.ChannelTypeRelationHasReferenceException; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateDeleteApi.java b/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateDeleteApi.java index e4a549df7ca22fa1207c73362003205c8cd13cba..f0885babeb12bf478c7360a74e51a74dae51cd8f 100644 --- a/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateDeleteApi.java @@ -2,12 +2,11 @@ package neatlogic.module.process.api.commenttemplate; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.auth.core.AuthActionChecker; -import neatlogic.framework.auth.core.AuthFactory; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.auth.PROCESS_COMMENT_TEMPLATE_MODIFY; -import neatlogic.framework.process.dao.mapper.ProcessCommentTemplateMapper; +import neatlogic.module.process.dao.mapper.process.ProcessCommentTemplateMapper; import neatlogic.framework.process.dto.ProcessCommentTemplateVo; import neatlogic.framework.process.exception.commenttemplate.ProcessCommentTemplateNotFoundException; import neatlogic.framework.restful.annotation.Input; diff --git a/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateSaveApi.java b/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateSaveApi.java index 5db4da231f52a6af40a78218b199abda9b850419..27fc7efad8fa75aeeb9067107253c0bd43281cef 100644 --- a/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateSaveApi.java @@ -8,7 +8,7 @@ import neatlogic.framework.dto.FieldValidResultVo; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.auth.PROCESS_COMMENT_TEMPLATE_MODIFY; -import neatlogic.framework.process.dao.mapper.ProcessCommentTemplateMapper; +import neatlogic.module.process.dao.mapper.process.ProcessCommentTemplateMapper; import neatlogic.framework.process.dto.ProcessCommentTemplateVo; import neatlogic.framework.process.exception.commenttemplate.ProcessCommentTemplateNameRepeatException; import neatlogic.framework.process.exception.commenttemplate.ProcessCommentTemplateNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateSearchApi.java b/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateSearchApi.java index e6a7a27e9ce0e7c9c91a3d6af35066e934e2a89a..48280d9118a62cae8b5c577d8679ff3079f4016a 100644 --- a/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/commenttemplate/ProcessCommentTemplateSearchApi.java @@ -9,7 +9,7 @@ import neatlogic.framework.common.constvalue.UserType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.auth.PROCESS_COMMENT_TEMPLATE_MODIFY; -import neatlogic.framework.process.dao.mapper.ProcessCommentTemplateMapper; +import neatlogic.module.process.dao.mapper.process.ProcessCommentTemplateMapper; import neatlogic.framework.process.dto.ProcessCommentTemplateSearchVo; import neatlogic.framework.process.dto.ProcessCommentTemplateVo; import neatlogic.framework.restful.annotation.Input; diff --git a/src/main/java/neatlogic/module/process/api/form/FormAttributeCheckApi.java b/src/main/java/neatlogic/module/process/api/form/FormAttributeCheckApi.java index 1bed04023397e2fa605ebeff9325decd3e144964..670a373812976249af17456a0b3ebbde1ff79a23 100644 --- a/src/main/java/neatlogic/module/process/api/form/FormAttributeCheckApi.java +++ b/src/main/java/neatlogic/module/process/api/form/FormAttributeCheckApi.java @@ -6,17 +6,17 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.exception.type.ParamIrregularException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.restful.annotation.*; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.form.dao.mapper.FormMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.form.dto.AttributeDataVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.form.dto.FormAttributeVo; @@ -26,7 +26,6 @@ import neatlogic.framework.process.dto.ProcessTaskFormVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; import neatlogic.framework.form.exception.FormActiveVersionNotFoundExcepiton; -import neatlogic.framework.form.exception.FormAttributeHandlerNotFoundException; import neatlogic.framework.form.exception.FormAttributeNotFoundException; import neatlogic.framework.process.exception.processtask.ProcessTaskNotFoundException; import neatlogic.framework.form.attribute.core.FormAttributeHandlerFactory; diff --git a/src/main/java/neatlogic/module/process/api/priority/PriorityDeleteApi.java b/src/main/java/neatlogic/module/process/api/priority/PriorityDeleteApi.java index 42a36e236b25fac6001b7fbf5eff7b5228ed9aec..89323913e3cb8ca33a4a0ba597c407d2b63874dd 100755 --- a/src/main/java/neatlogic/module/process/api/priority/PriorityDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/priority/PriorityDeleteApi.java @@ -1,6 +1,6 @@ package neatlogic.module.process.api.priority; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.exception.priority.PriorityIsInvokedException; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.OperationType; @@ -12,7 +12,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.process.exception.priority.PriorityNotFoundException; import neatlogic.framework.restful.annotation.Description; diff --git a/src/main/java/neatlogic/module/process/api/priority/PriorityGetApi.java b/src/main/java/neatlogic/module/process/api/priority/PriorityGetApi.java index 6ac02aa7c06a442c927afd110becba428a234e45..5c1a320c536069fbe3a5531025bc2a5b2214ca97 100755 --- a/src/main/java/neatlogic/module/process/api/priority/PriorityGetApi.java +++ b/src/main/java/neatlogic/module/process/api/priority/PriorityGetApi.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.process.exception.priority.PriorityNotFoundException; @Service diff --git a/src/main/java/neatlogic/module/process/api/priority/PriorityMoveApi.java b/src/main/java/neatlogic/module/process/api/priority/PriorityMoveApi.java index 016aab75f8f397a2bffa4b1b711858b96491361f..e1100b76fc5b7bd33d03dc2d72c6ab5a985c9707 100755 --- a/src/main/java/neatlogic/module/process/api/priority/PriorityMoveApi.java +++ b/src/main/java/neatlogic/module/process/api/priority/PriorityMoveApi.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.process.exception.priority.PriorityNotFoundException; import neatlogic.framework.restful.annotation.Description; diff --git a/src/main/java/neatlogic/module/process/api/priority/PrioritySaveApi.java b/src/main/java/neatlogic/module/process/api/priority/PrioritySaveApi.java index af2f91b67b223b9039209dd99973897be37175db..9046c3d37e5a91d58c6842fab0642aeeef2e458a 100755 --- a/src/main/java/neatlogic/module/process/api/priority/PrioritySaveApi.java +++ b/src/main/java/neatlogic/module/process/api/priority/PrioritySaveApi.java @@ -18,7 +18,7 @@ import com.alibaba.fastjson.TypeReference; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.process.exception.priority.PriorityNameRepeatException; import neatlogic.framework.process.exception.priority.PriorityNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/priority/PrioritySearchApi.java b/src/main/java/neatlogic/module/process/api/priority/PrioritySearchApi.java index e6bb96964eb888b4d8eefa8759a8749b05608e53..4d7748fef391a61a36f6ea08d42392b86f88116c 100755 --- a/src/main/java/neatlogic/module/process/api/priority/PrioritySearchApi.java +++ b/src/main/java/neatlogic/module/process/api/priority/PrioritySearchApi.java @@ -17,7 +17,7 @@ import com.alibaba.fastjson.TypeReference; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.util.PageUtil; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PriorityVo; @Service @AuthAction(action = PROCESS_BASE.class) diff --git a/src/main/java/neatlogic/module/process/api/priority/PrioritySearchForSelectApi.java b/src/main/java/neatlogic/module/process/api/priority/PrioritySearchForSelectApi.java index de832f1b505caf5520a6f1926954c589b7c0fb98..1bfd76095425ef9c02f830f79fb2ca0ce2d42b4e 100755 --- a/src/main/java/neatlogic/module/process/api/priority/PrioritySearchForSelectApi.java +++ b/src/main/java/neatlogic/module/process/api/priority/PrioritySearchForSelectApi.java @@ -5,7 +5,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessCopyApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessCopyApi.java index 1ee3e0d540cdc83c01db0bc56b1464d14a19638f..4a95a26c293bbe201b4f5f8492d64021d165459c 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessCopyApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessCopyApi.java @@ -15,7 +15,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.IValid; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.RegexUtils; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.service.ProcessService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessDeleteApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessDeleteApi.java index dc6bf7292bc1b26629e59122355e01f3aabd563b..3d5dece6f1e46b9b5eeb663efe399a695209e906 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessDeleteApi.java @@ -1,14 +1,11 @@ package neatlogic.module.process.api.process; -import neatlogic.framework.dependency.core.DependencyManager; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.process.auth.PROCESS_MODIFY; -import neatlogic.module.process.dao.mapper.ProcessMapper; -import neatlogic.module.process.dependency.handler.*; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.service.ProcessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,8 +19,6 @@ import neatlogic.framework.process.dto.ProcessDraftVo; import neatlogic.framework.process.exception.process.ProcessNotFoundException; import neatlogic.framework.process.exception.process.ProcessReferencedCannotBeDeleteException; -import java.util.List; - @Service @Transactional @OperationType(type = OperationTypeEnum.DELETE) diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessDraftClearApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessDraftClearApi.java index 6bf9d2a74724dd9ca9a1b2c44ef8a9c34ef87190..c52f4d1471fe5814a208acacc88f50ef45f33d60 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessDraftClearApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessDraftClearApi.java @@ -2,7 +2,7 @@ package neatlogic.module.process.api.process; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.OperationType; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessDraftGetApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessDraftGetApi.java index 410c5831e4b60da0779c7f573e90f35be0a3a55e..10ddc3741e9d6e11bdc46e897bb2bf3fab4be0d9 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessDraftGetApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessDraftGetApi.java @@ -9,7 +9,7 @@ import neatlogic.framework.process.exception.process.ProcessDraftNotFoundExcepti import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessDraftListApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessDraftListApi.java index e7dacd0b1e089210d6b0f9f85600e9977e355a25..89049d365e6337cc90283fb1d135f4b69179f094 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessDraftListApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessDraftListApi.java @@ -7,7 +7,7 @@ import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.process.auth.PROCESS_MODIFY; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessDraftSaveApi.java index 9d60d32dba0a701694f887b6163dce690d2f3736..c72f4a91d3356a7b75dc901b49e11ed61372f6d0 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessDraftSaveApi.java @@ -9,7 +9,7 @@ import neatlogic.framework.process.dto.ProcessDraftVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessExportApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessExportApi.java index c5b342a3f3ef92289f268db1e7050389fbd51a4c..0b48f1fc0311376eee157001acb1e0db894aff4b 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessExportApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessExportApi.java @@ -11,7 +11,7 @@ import neatlogic.framework.restful.annotation.OperationType; import neatlogic.framework.restful.annotation.Param; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateBinaryStreamApiComponentBase; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import com.alibaba.fastjson.JSONObject; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java index 13e53deb9386f22137ab810cf1fe51550342a1f3..ae3b1152a29cd111559c0e0e2004b2ecc67cee89 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java @@ -6,7 +6,7 @@ import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.process.auth.PROCESS_MODIFY; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessImportApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessImportApi.java index c2f3f1b4a6f318d7f162795bc3ff613eb5d58f79..4e9a6614a627a54b94b8da487355abab4ff9b690 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessImportApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessImportApi.java @@ -8,7 +8,7 @@ import java.util.Map.Entry; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessReferenceListApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessReferenceListApi.java index be554e3a57ad59d8fcfd9e1c4d5f8ac005c6a0f2..6bcc4a8b08fea0ee0fb4ba69ff9635b90648947f 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessReferenceListApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessReferenceListApi.java @@ -6,14 +6,14 @@ import java.util.List; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.service.CatalogService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java index 20cad50ca9a47bd5ed7926a6945820f2170f25f6..6faf59e0d82bd911fac2bdae980ac3f93e6c9c09 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java @@ -12,7 +12,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.IValid; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.RegexUtils; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.service.ProcessService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessSearchApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessSearchApi.java index 24297a9039ac7f51ac7ecfb215b3afff86125c7c..c5b175d6b0bb4f3e14edb77ea88ec970d2bfb512 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessSearchApi.java @@ -11,7 +11,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import com.alibaba.fastjson.JSONArray; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessSearchForSelectApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessSearchForSelectApi.java index c0edc4b3dc4f828eef3f66a432b61e3e267e79f3..99db02aad76926c424f851e11cbb00374990914e 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessSearchForSelectApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessSearchForSelectApi.java @@ -11,7 +11,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessTagGetApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessTagGetApi.java index 2c8fedfa1955478bffc94e455a5df07415a3b9c9..f3fbe9b048dfbb990254ce9f3bc3cf2ffd923b63 100755 --- a/src/main/java/neatlogic/module/process/api/process/ProcessTagGetApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessTagGetApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.process; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTagMapper; +import neatlogic.module.process.dao.mapper.process.ProcessTagMapper; import com.alibaba.fastjson.JSONArray; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessTypeListApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessTypeListApi.java index 1d5b5744a9ab4cf74a8bf9fd2c8c6aeaff94d916..7429f97255df431905e346df51d302a1002f6d7f 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessTypeListApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessTypeListApi.java @@ -6,7 +6,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.OperationType; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessUpdateApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessUpdateApi.java index 76509ff12d52773f006071d08562b570fb0d9729..df403bf6f5ba919c4e5060423afb15f5fdbdefdb 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessUpdateApi.java @@ -12,7 +12,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.IValid; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.RegexUtils; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; diff --git a/src/main/java/neatlogic/module/process/api/processstep/ProcessStepHandleConfigSaveApi.java b/src/main/java/neatlogic/module/process/api/processstep/ProcessStepHandleConfigSaveApi.java index 2675e5e8f345c5fe6e95ca714c7d76322984188d..d81622aef0d2b58f77a69ee7e41a4224581d47be 100644 --- a/src/main/java/neatlogic/module/process/api/processstep/ProcessStepHandleConfigSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processstep/ProcessStepHandleConfigSaveApi.java @@ -6,7 +6,7 @@ import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.dependency.core.DependencyManager; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dao.mapper.NotifyMapper; -import neatlogic.framework.process.dao.mapper.ProcessStepHandlerMapper; +import neatlogic.module.process.dao.mapper.process.ProcessStepHandlerMapper; import neatlogic.framework.process.dto.ProcessStepHandlerVo; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; diff --git a/src/main/java/neatlogic/module/process/api/processstep/ProcessStepHandlerSearchApi.java b/src/main/java/neatlogic/module/process/api/processstep/ProcessStepHandlerSearchApi.java index bfe1bad51daf2474f251d4e8f46692f6d0ea1f87..1e5517f8ece922de77856e6d60783537fbd40f56 100755 --- a/src/main/java/neatlogic/module/process/api/processstep/ProcessStepHandlerSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/processstep/ProcessStepHandlerSearchApi.java @@ -4,7 +4,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessStepType; -import neatlogic.framework.process.dao.mapper.ProcessStepHandlerMapper; +import neatlogic.module.process.dao.mapper.process.ProcessStepHandlerMapper; import neatlogic.framework.process.dto.ProcessStepHandlerVo; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchAbortProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchAbortProcessTaskApi.java index d1b5b5703b2d841c3ab4f5289da233d6ec4fb39f..3dc808c018a85d7b1ffec4aa2f176541312031b6 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchAbortProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchAbortProcessTaskApi.java @@ -19,7 +19,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchDeleteProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchDeleteProcessTaskApi.java index c831dae0beb083bee5d1e603859eff7d844af5a2..e601d51476c9f81cfc3f071b2abff882e052abde 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchDeleteProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchDeleteProcessTaskApi.java @@ -20,11 +20,11 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchHideProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchHideProcessTaskApi.java index a68429cf0c6c208552a4e4dbe159ba7ab7e0392b..821553cca7629c3c7bbac539c6c1a21d91cb6660 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchHideProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchHideProcessTaskApi.java @@ -20,7 +20,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchPauseProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchPauseProcessTaskApi.java index 378a862a6e8dfaf36cfd47f724ad46a07b0a5225..2426b7145de31147717eec192190e743aab5b506 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchPauseProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchPauseProcessTaskApi.java @@ -20,7 +20,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchUrgeProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchUrgeProcessTaskApi.java index 06a53689cb16f21ee88659d5d53c6ace00e70176..255148f1488cf59bceb9a64bd5ce233e0b448d31 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchUrgeProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchUrgeProcessTaskApi.java @@ -22,13 +22,13 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.service.ProcessTaskAgentService; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.ProcessTaskAgentService; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; diff --git a/src/main/java/neatlogic/module/process/api/processtask/DeleteProcessTaskStepInOperationApi.java b/src/main/java/neatlogic/module/process/api/processtask/DeleteProcessTaskStepInOperationApi.java index a11acb602f534eecec98f714f88f33c413f8904b..815bab0db96acaa7a3fd6b11ce31b340629f91c8 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/DeleteProcessTaskStepInOperationApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/DeleteProcessTaskStepInOperationApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.processtask; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java index cd3c46b3055cf8d3d7ed4fdff53463b7526adee7..ffbc7ebd3633f46c894397f268ef206822d11e95 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java @@ -12,8 +12,8 @@ import neatlogic.framework.process.audithandler.core.ProcessTaskAuditDetailTypeF import neatlogic.framework.process.audithandler.core.ProcessTaskStepAuditDetailHandlerFactory; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepAuditDetailVo; import neatlogic.framework.process.dto.ProcessTaskStepAuditVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java index c1c812659c2869cee722a173dad16f71fa9d7537..f062f85baf83b6b970d13624a09593422e2c075f 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java @@ -6,7 +6,7 @@ import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; import neatlogic.framework.process.exception.processtask.ProcessTaskAutomaticNotAllowNextStepsException; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticRetryApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticRetryApi.java index 7d89679352f53b77dbafcb7be6ba9ae28b4ba5a9..2a67c65023075f379a74d5e3505d86a3f96dba68 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticRetryApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticRetryApi.java @@ -7,12 +7,11 @@ import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskStatus; import neatlogic.framework.process.constvalue.ProcessTaskStepDataType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; -import neatlogic.framework.process.dto.automatic.AutomaticConfigVo; import neatlogic.framework.process.exception.processtask.ProcessTaskStepNotFoundException; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskBackApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskBackApi.java index a5feb356646e149792084b02f88434a98612d853..ebd4147dc794c5050ad3f6cf20d96185f1489df3 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskBackApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskBackApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.processtask; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskStepNotFoundException; import neatlogic.framework.process.stephandler.core.IProcessStepHandler; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java index e40caa48fdcd528da1b892839edb841fee0866c7..c42ceb0c7954b47725bf64e387a527fe071adc3d 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java @@ -4,21 +4,19 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.exception.file.FileNotFoundException; -import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.file.dao.mapper.FileMapper; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepDataType; import neatlogic.framework.process.crossover.IProcessTaskCommentApiCrossoverService; -import neatlogic.framework.process.dao.mapper.ProcessCommentTemplateMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.process.ProcessCommentTemplateMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; import neatlogic.framework.process.dto.*; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -57,7 +55,7 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP private ProcessCommentTemplateMapper commentTemplateMapper; @Autowired - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Override public String getToken() { @@ -163,9 +161,9 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP // 生成活动 processTaskStepVo.getParamObj().putAll(jsonObj); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.COMMENT); - IProcessStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepNotifyTriggerType.COMMENT); - IProcessStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepNotifyTriggerType.COMMENT); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.COMMENT); + processStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepNotifyTriggerType.COMMENT); + processStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepNotifyTriggerType.COMMENT); JSONObject resultObj = new JSONObject(); List typeList = new ArrayList<>(); typeList.add(ProcessTaskOperationType.STEP_COMMENT.getValue()); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java index 5f08edddafbbd575c7315db5f306dba0f31d756e..d98bddeb4f1e90184ae889c0d0623f805f09dbc5 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java @@ -2,17 +2,19 @@ package neatlogic.module.process.api.processtask; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.framework.process.crossover.IProcessStepHandlerCrossoverUtil; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepReplyVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskStepCommentNotFoundException; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -39,7 +41,7 @@ public class ProcessTaskCommentDeleteApi extends PrivateApiComponentBase { private ProcessTaskService processTaskService; @Autowired - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Override public String getToken() { @@ -88,7 +90,7 @@ public class ProcessTaskCommentDeleteApi extends PrivateApiComponentBase { //生成活动 ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(replyVo.getProcessTaskStepId()); processTaskStepVo.getParamObj().putAll(jsonObj); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.DELETECOMMENT); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.DELETECOMMENT); JSONObject resultObj = new JSONObject(); List typeList = new ArrayList<>(); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java index 4df5863d28c8383c1987ffca9baa5779e25f4d48..b20f4ce6841893f51d3291b52c5589007b157eb6 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java @@ -6,12 +6,12 @@ import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepReplyVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskStepCommentNotFoundException; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -38,7 +38,7 @@ public class ProcessTaskCommentEditApi extends PrivateApiComponentBase { private ProcessTaskService processTaskService; @Autowired - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Override public String getToken() { @@ -90,7 +90,7 @@ public class ProcessTaskCommentEditApi extends PrivateApiComponentBase { //生成活动 ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(oldReplyVo.getProcessTaskStepId()); processTaskStepVo.getParamObj().putAll(jsonObj); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.EDITCOMMENT); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.EDITCOMMENT); } JSONObject resultObj = new JSONObject(); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java index 01aa7a67c74794f5a5938211e1e31e1b0c3fc64c..8a5aa669f7f5942d657e3eee5e7168d83cc92c51 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java @@ -8,12 +8,16 @@ import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.SlaStatus; -import neatlogic.framework.process.dao.mapper.*; import neatlogic.framework.process.dto.agent.ProcessTaskAgentVo; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.service.ProcessTaskAgentService; +import neatlogic.module.process.service.ProcessTaskAgentService; import neatlogic.framework.service.AuthenticationInfoService; import neatlogic.framework.util.TableResultUtil; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskAgentMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java index f22d3c27ca2773e238f2fbeaafde86d290a1c7c8..4f0e1a71977f74d519b51e563d6ad428eca23654 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java @@ -22,17 +22,17 @@ import neatlogic.framework.fulltextindex.core.FullTextIndexHandlerFactory; import neatlogic.framework.fulltextindex.core.IFullTextIndexHandler; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskSerialNumberMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskSlaMapper; -import neatlogic.framework.process.dao.mapper.score.ProcessTaskScoreMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; +import neatlogic.module.process.dao.mapper.score.ProcessTaskScoreMapper; import neatlogic.framework.process.dto.ProcessTaskRelationVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskNotFoundException; import neatlogic.framework.process.fulltextindex.ProcessFullTextIndexType; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; @@ -66,7 +66,7 @@ public class ProcessTaskDeleteApi extends PrivateApiComponentBase { private ProcessTaskSerialNumberMapper processTaskSerialNumberMapper; @Resource - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Resource private ProcessTaskService processTaskService; @@ -101,8 +101,8 @@ public class ProcessTaskDeleteApi extends PrivateApiComponentBase { // is_deleted置为1 taskMapper.updateProcessTaskIsDeletedById(processTaskId, 1); ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(processTaskId, null); - IProcessStepHandlerUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.DELETEPROCESSTASK); - IProcessStepHandlerUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.DELETEPROCESSTASK); + processStepHandlerUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.DELETEPROCESSTASK); + processStepHandlerUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.DELETEPROCESSTASK); return null; } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java index 97e51f3346beeb35df242466287e92334b33c885..7a6730bfbccb5d1ed461e058980d4d1fe3003783 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java @@ -29,7 +29,6 @@ import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.form.dto.FormVersionVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.channel.ChannelNotFoundEditTargetException; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; @@ -45,7 +44,12 @@ import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFa import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.service.CatalogService; import neatlogic.module.process.service.ProcessTaskService; import org.apache.commons.collections4.CollectionUtils; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFlowChartApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFlowChartApi.java index 1cf65e4d8bc7190fcbb00299330c91e5b3b046bb..bfd0f47861b02ca857e7fb212bd603f15b5360ff 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFlowChartApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFlowChartApi.java @@ -8,11 +8,11 @@ import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; import neatlogic.framework.process.constvalue.ProcessTaskStepUserStatus; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; -import neatlogic.framework.process.dao.mapper.task.TaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; import neatlogic.framework.process.exception.process.ProcessNotFoundException; @@ -21,7 +21,7 @@ import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.service.ProcessTaskService; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUpdateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUpdateApi.java index 9382108345b49468f88f0d4c5e970a77374f146f..365a6b7d9a9dbb4f84fd7bc8f705d9382a9d8882 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUpdateApi.java @@ -5,11 +5,11 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskFocusRepeatException; import neatlogic.framework.process.exception.processtask.ProcessTaskNotFoundException; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -27,7 +27,7 @@ public class ProcessTaskFocusUpdateApi extends PrivateApiComponentBase { private ProcessTaskMapper processTaskMapper; @Resource - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Override public String getToken() { @@ -67,10 +67,10 @@ public class ProcessTaskFocusUpdateApi extends PrivateApiComponentBase { throw new ProcessTaskFocusRepeatException(processTaskId); } processTaskMapper.insertProcessTaskFocus(processTaskId,userUuid); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.FOCUSTASK); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.FOCUSTASK); }else{ processTaskMapper.deleteProcessTaskFocus(processTaskId,userUuid); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UNDOFOCUSTASK); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UNDOFOCUSTASK); } JSONObject result = new JSONObject(); result.put("isFocus",isFocus); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserListApi.java index 94ade60787d1a96b6d067c9ba9b06a7480237f49..3da9540116ba9ad136c4544b480a6f927394f9f1 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserListApi.java @@ -20,7 +20,7 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.processtask.ProcessTaskNotFoundException; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserUpdateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserUpdateApi.java index d77bc2126d5a50369240adfe57ace78da77f61b1..8d37c2425d279af5def41e9a0c79bd1f3e048d11 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserUpdateApi.java @@ -2,17 +2,15 @@ package neatlogic.module.process.api.processtask; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; @@ -42,7 +40,7 @@ public class ProcessTaskFocusUserUpdateApi extends PrivateApiComponentBase { private ProcessTaskService processTaskService; @Resource - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Override public String getToken() { @@ -82,9 +80,9 @@ public class ProcessTaskFocusUserUpdateApi extends PrivateApiComponentBase { ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); processTaskStepVo.setProcessTaskId(processTaskVo.getId()); processTaskStepVo.getParamObj().putAll(paramObj); - IProcessStepHandlerUtil.saveFocusUserList(processTaskStepVo); + processStepHandlerUtil.saveFocusUserList(processTaskStepVo); /** 生成活动 **/ - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UPDATEFOCUSUSER); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UPDATEFOCUSUSER); return null; } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java index fec9772b5943a453ea484a61997990b057d7fcf3..83fe68bb202b1602bca1ffc8b1d2b46cc1a7db25 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java @@ -3,16 +3,10 @@ package neatlogic.module.process.api.processtask; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dto.ChannelVo; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; -import neatlogic.framework.process.exception.channel.ChannelNotFoundException; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; -import neatlogic.framework.process.exception.processtask.ProcessTaskViewDeniedException; import org.apache.commons.collections4.MapUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskImportFromExcelApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskImportFromExcelApi.java index 00acbbe7f271e8d9a33ab95b6c1d6adfd63ca395..f40acc1257fac6743fb0e6a5a8a8614ca681845e 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskImportFromExcelApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskImportFromExcelApi.java @@ -11,9 +11,9 @@ import neatlogic.framework.form.exception.FormActiveVersionNotFoundExcepiton; import neatlogic.framework.form.exception.FormNotFoundException; import neatlogic.framework.process.auth.BATCH_REPORT_PROCESS_TASK; import neatlogic.framework.process.constvalue.ProcessTaskSource; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.PriorityMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; import neatlogic.framework.process.exception.process.ProcessNotFoundException; @@ -21,7 +21,7 @@ import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateBinaryStreamApiComponentBase; import neatlogic.framework.util.ExcelUtil; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.service.ProcessTaskCreatePublicService; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskListForRelationApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskListForRelationApi.java index 0ac019c4917801ce29c8d1a80bc4e70439f8c506..79c102db4782222dfda4301a75222d0e96f4d854 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskListForRelationApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskListForRelationApi.java @@ -8,7 +8,7 @@ import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.UserVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.ProcessTaskSearchVo; import neatlogic.module.process.service.ProcessTaskService; import neatlogic.framework.util.TableResultUtil; @@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.channeltype.ChannelTypeRelationNotFoundException; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskListForRepeatApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskListForRepeatApi.java index 0a566af705efb2cb83790e51b2646e9d087ba2bd..d208875ef3ee4a560ff379f252dd5e616789245d 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskListForRepeatApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskListForRepeatApi.java @@ -24,7 +24,7 @@ import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.UserVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskSearchVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskOldFormPropGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskOldFormPropGetApi.java index e6552e1b4c2a0a638ae6ae68042b70392f6b860a..6cb9b8f2bf76f89e99f6442a7c0c4a18c6afaf6b 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskOldFormPropGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskOldFormPropGetApi.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java index b5aef94e1cbf0247ab3af76aaa122bbb53722ae9..3671c78bef22c609dfa2003fa0c0e435a39b0007 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.module.process.service.ProcessTaskService; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskReapprovalApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskReapprovalApi.java index 1559a638d0161b7eb066c16ce95f9565735b8a23..396051f5036fa31f15dd5301e2a5bc51a4be1f16 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskReapprovalApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskReapprovalApi.java @@ -24,7 +24,7 @@ import neatlogic.framework.fulltextindex.core.FullTextIndexHandlerFactory; import neatlogic.framework.fulltextindex.core.IFullTextIndexHandler; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskStepDataType; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationDeleteApi.java index 2fa60fe34626a9d2c968840c89fefb14650ea5a4..dadae83e76ba3aa937a5ded21199412f4bebaeb7 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationDeleteApi.java @@ -6,12 +6,12 @@ import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskRelationVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; @@ -36,7 +36,7 @@ public class ProcessTaskRelationDeleteApi extends PrivateApiComponentBase { private ProcessTaskMapper processTaskMapper; @Autowired - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Override public String getToken() { @@ -77,7 +77,7 @@ public class ProcessTaskRelationDeleteApi extends PrivateApiComponentBase { processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.PROCESSTASKLIST.getParamName(), JSON.toJSONString(Arrays.asList(processTaskRelationVo.getTarget()))); processTaskStepVo.getParamObj().put("source", jsonObj.getString("source")); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.DELETERELATION); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.DELETERELATION); ProcessTaskStepVo processTaskStep = new ProcessTaskStepVo(); processTaskStep.setProcessTaskId(processTaskRelationVo.getTarget()); @@ -86,7 +86,7 @@ public class ProcessTaskRelationDeleteApi extends PrivateApiComponentBase { processTaskStep.getParamObj().put(ProcessTaskAuditDetailType.PROCESSTASKLIST.getParamName(), JSON.toJSONString(Arrays.asList(processTaskRelationVo.getSource()))); processTaskStep.getParamObj().put("source", jsonObj.getString("source")); - IProcessStepHandlerUtil.audit(processTaskStep, ProcessTaskAuditType.DELETERELATION); + processStepHandlerUtil.audit(processTaskStep, ProcessTaskAuditType.DELETERELATION); } return null; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationListApi.java index fd84b846f8ccae70698f02ccdf865b88803a4d96..42b3627992b9e3f3a1e379ed5773468f5f4809cd 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationListApi.java @@ -10,12 +10,8 @@ import java.util.Set; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; -import neatlogic.framework.process.exception.channel.ChannelNotFoundException; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; -import neatlogic.framework.process.exception.processtask.ProcessTaskViewDeniedException; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -28,8 +24,8 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ChannelTypeRelationVo; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ChannelVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java index 26b54039fa3c401a966410060a543a9501125b25..90d467d1531804bf6909a28c54a14139af3e8d0a 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java @@ -7,14 +7,14 @@ import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.crossover.IProcessTaskRelationSaveApiCrossoverService; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskRelationVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.channeltype.ChannelTypeRelationNotFoundException; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatDeleteApi.java index 3ef39603285a811c2dd43535c5d5df7a8bfb175f..e9bfe386d591fc9c9c90b3b4efb29d3350fb5258 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatDeleteApi.java @@ -19,10 +19,10 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.module.process.service.ProcessTaskService; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; import neatlogic.framework.restful.annotation.Param; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatListApi.java index cf0ae46c4f6f1a21271e2cb920e592d59eaec8dc..c93b4958ef8419d8e6790dd47931fca635423b9e 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatListApi.java @@ -18,9 +18,9 @@ package neatlogic.module.process.api.processtask; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatSaveApi.java index c3b7d87105a2f1263b9079e152984f14617d1005..777da97cb9e3e5a451c162fb8d5cf59678f285c4 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatSaveApi.java @@ -20,21 +20,19 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.exception.type.ParamNotExistsException; -import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskRepeatVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.exception.processtask.ProcessTaskNotFoundException; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.module.process.service.ProcessTaskService; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRetreatableStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRetreatableStepListApi.java index 56edad3a1ad3f40c7e06b60d074a49dd2db7f399..565068dafd075e87768a3c9364b2280f6c4a8804 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRetreatableStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRetreatableStepListApi.java @@ -5,7 +5,7 @@ import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.crossover.IProcessTaskRetreatableStepListApiCrossoverService; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.service.ProcessTaskAgentService; +import neatlogic.module.process.service.ProcessTaskAgentService; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskSerialNumberUpdateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskSerialNumberUpdateApi.java index fdedee37a83447237ec36fc3f5bf2c38b7a9c15e..f760a75613f69ab02e97cddf30b20dbedec0856c 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskSerialNumberUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskSerialNumberUpdateApi.java @@ -19,7 +19,7 @@ import neatlogic.framework.asynchronization.threadpool.CachedThreadPool; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.CHANNELTYPE_MODIFY; -import neatlogic.framework.process.dao.mapper.ProcessTaskSerialNumberMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; import neatlogic.framework.process.dto.ProcessTaskSerialNumberPolicyVo; import neatlogic.framework.process.exception.processtaskserialnumberpolicy.ProcessTaskSerialNumberPolicyHandlerNotFoundException; import neatlogic.framework.process.exception.processtaskserialnumberpolicy.ProcessTaskSerialNumberPolicyNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskShowHideApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskShowHideApi.java index 876080b8c75c532b19350cf670083aca8f4f9a2d..bec8a89997b5451cabed7aabee21b4aec0ab2e47 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskShowHideApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskShowHideApi.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.Description; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java index c96d1e02e4e48a40b4e72d488e212fccd71d376e..f096e158cd42e84f89cd8b77f7db08a2fca3f5e4 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.Description; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java index eed44de800a54c6f2a6696d89acc6626f86579f9..c2c7c88f4d9cd04736384e771e4bf2a97f8eb113 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java @@ -6,8 +6,8 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepDataType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java index e0060321b732683c63b7dcbf52954108df1cd7af..d92c3ac6b121958a046eac24732688be5c5378c6 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java @@ -9,8 +9,8 @@ import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ItsmTenantConfig; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.ProcessTaskScoreTemplateVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java index cbdce2afa59724a57404ae4dd07ea215ac6d9374..e03200515143637b9e3b95c68c207a3278c75ce5 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java @@ -5,9 +5,9 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessTaskScoreTemplateVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java index 73505b6070884ccfd1dfcf35dee1e961b7b0e87b..90ac2fb4185701a7697b1e3b91e99243d58affef 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java @@ -8,8 +8,8 @@ import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessStepType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepSlaTimeListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepSlaTimeListApi.java index 21ad6e21da62cefa4291e0d8ef1a3eae7e07c677..ebe454103014004167518cd799bc6b144c9175b5 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepSlaTimeListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepSlaTimeListApi.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskSlaTimeVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskStepNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStatusChangeApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStatusChangeApi.java index d36bfb38066a2f8b33a635f77985be6a9ddd3467..d27921e79459dc36386f07a2b4d586f7c9d96f48 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStatusChangeApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStatusChangeApi.java @@ -40,7 +40,7 @@ import neatlogic.framework.dto.UserVo; import neatlogic.framework.exception.type.ParamNotExistsException; import neatlogic.framework.exception.user.UserNotFoundException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepRelVo; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStatusListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStatusListApi.java index 845562c5b7bba0f2376fc72636f641e3ce50bc16..7e6862ae6c25973f0bf7236db01e58846bc9318f 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStatusListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStatusListApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.processtask; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.module.process.service.ProcessTaskService; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTemplateExportApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTemplateExportApi.java index e2087c8ccb925af86b761a891a36adbece562aa3..ce22a55a0d1d9f4d670465e5d130b6dd209c287a 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTemplateExportApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTemplateExportApi.java @@ -11,7 +11,7 @@ import neatlogic.framework.form.dto.FormVo; import neatlogic.framework.form.exception.FormActiveVersionNotFoundExcepiton; import neatlogic.framework.form.exception.FormNotFoundException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; import neatlogic.framework.process.exception.process.ProcessNotFoundException; @@ -20,7 +20,7 @@ import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateBinaryStreamApiComponentBase; import neatlogic.framework.util.ExcelUtil; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections4.CollectionUtils; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferKnowledgeAuditApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferKnowledgeAuditApi.java index 93bd02bef4305bf4e3033c72544016ee2134c165..ce1754ad1ee496a9098cbcf9c15719caca3358f9 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferKnowledgeAuditApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferKnowledgeAuditApi.java @@ -4,9 +4,9 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; @@ -32,7 +32,7 @@ public class ProcessTaskTransferKnowledgeAuditApi extends PrivateApiComponentBas private ProcessTaskService processTaskService; @Autowired - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Override public String getToken() { @@ -64,7 +64,7 @@ public class ProcessTaskTransferKnowledgeAuditApi extends PrivateApiComponentBas ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); processTaskStepVo.setProcessTaskId(processTaskId); processTaskStepVo.getParamObj().putAll(jsonObj); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.TRANSFERKNOWLEDGE); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.TRANSFERKNOWLEDGE); return null; } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferableStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferableStepListApi.java index efcb93dbf65f97cd93df0cc91ea646ae1c278bae..0f21b5ee534d7aec5ae361fea6f7c870a6b25ef1 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferableStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferableStepListApi.java @@ -4,7 +4,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.service.ProcessTaskAgentService; +import neatlogic.module.process.service.ProcessTaskAgentService; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUpdateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUpdateApi.java index 17da9ebbed9ca59b645004738f6d1e096deea9fa..97409e56c7a05aeaa0b4ad79e0824b4333e430bc 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUpdateApi.java @@ -17,22 +17,20 @@ package neatlogic.module.process.api.processtask; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.fulltextindex.core.FullTextIndexHandlerFactory; import neatlogic.framework.fulltextindex.core.IFullTextIndexHandler; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.PriorityMapper; -import neatlogic.framework.process.dao.mapper.ProcessTagMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import neatlogic.module.process.dao.mapper.process.ProcessTagMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.priority.PriorityNotFoundException; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.fulltextindex.ProcessFullTextIndexType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; @@ -72,7 +70,7 @@ public class ProcessTaskUpdateApi extends PrivateApiComponentBase { private ProcessTaskService processTaskService; @Resource - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Override public String getToken() { @@ -213,8 +211,8 @@ public class ProcessTaskUpdateApi extends PrivateApiComponentBase { processTaskStepVo.setProcessTaskId(processTaskId); } processTaskStepVo.getParamObj().putAll(jsonObj); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UPDATE); - IProcessStepHandlerUtil.calculateSla(new ProcessTaskVo(processTaskId), false); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UPDATE); + processStepHandlerUtil.calculateSla(new ProcessTaskVo(processTaskId), false); } //创建全文检索索引 diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUrgeApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUrgeApi.java index efe9127d960cfa7a70e0e85cbe26ae843ad934bf..d0f70f073236d3967b5871e609f0cff416e09a87 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUrgeApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUrgeApi.java @@ -6,14 +6,13 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; -import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.service.ProcessTaskAgentService; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.ProcessTaskAgentService; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcesstaskImportAuditSearchApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcesstaskImportAuditSearchApi.java index 654d997ede41dab363546aa7ff45ec5e6f11cc71..a917b5974885ca770240e97300ae31a10166a9fd 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcesstaskImportAuditSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcesstaskImportAuditSearchApi.java @@ -10,7 +10,7 @@ import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.UserVo; import neatlogic.framework.process.auth.BATCH_REPORT_PROCESS_TASK; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskImportAuditVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskFileApi.java b/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskFileApi.java index ab013d7efebc92861c6b52e000f9d7533b94e6bc..d03dbffcb43a1a823f7c069c1fcce013dba56736 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskFileApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskFileApi.java @@ -25,7 +25,7 @@ import neatlogic.framework.file.dao.mapper.FileMapper; import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.form.constvalue.FormHandler; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskListForOwnerApi.java b/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskListForOwnerApi.java index d957d132b8fa2e526e43e9b0054b67fc480ff6f9..082461fe9949e4362ac7cf7ebb2e8d69cc331123 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskListForOwnerApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskListForOwnerApi.java @@ -20,10 +20,10 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.PriorityMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; diff --git a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskNeedScoreApi.java b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskNeedScoreApi.java index 7170334c6744cc678d84029b8c6ef5a3643e811e..ba7946c0bca066d1cbc577e044a9ebebf63a1fd0 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskNeedScoreApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskNeedScoreApi.java @@ -21,8 +21,8 @@ import com.alibaba.fastjson.JSONPath; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentDeleteApi.java index 9cb17919d3a36a72cbd947c19c780d4bf250d687..be8d96ceaa77e8c9896c8c0d2ab78b540e137829 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentDeleteApi.java @@ -19,7 +19,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskAgentMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskAgentMapper; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; diff --git a/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentGetApi.java index 9515616dd34ee0f4c46354ea68a5f91285cfd086..82c7681a22328d16de4ab67025cfe49a3ba72414 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentGetApi.java @@ -20,7 +20,7 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskAgentMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskAgentMapper; import neatlogic.framework.process.dto.agent.ProcessTaskAgentCompobVo; import neatlogic.framework.process.dto.agent.ProcessTaskAgentInfoVo; import neatlogic.framework.process.dto.agent.ProcessTaskAgentTargetVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentIsActiveUpdateApi.java b/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentIsActiveUpdateApi.java index a2db29cbd0e565133a463b5c981e7c58a2dd6c52..0ae019d26266bc491fee4a375f52c48072399a10 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentIsActiveUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentIsActiveUpdateApi.java @@ -19,7 +19,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskAgentMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskAgentMapper; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; diff --git a/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentSaveApi.java index ce61cd4f2ccfaec61a6df64c5d5ded93b47dbdc7..ab1f1a11dfde0d5e0bfc29dde7015c5f2feb2588 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/agent/ProcessTaskAgentSaveApi.java @@ -25,9 +25,9 @@ import neatlogic.framework.exception.type.ParamIrregularException; import neatlogic.framework.exception.user.AgentIsUserSelfException; import neatlogic.framework.exception.user.UserNotFoundException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskAgentMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskAgentMapper; import neatlogic.framework.process.dto.agent.ProcessTaskAgentCompobVo; import neatlogic.framework.process.dto.agent.ProcessTaskAgentInfoVo; import neatlogic.framework.process.dto.agent.ProcessTaskAgentTargetVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/datamigration/ProcessTaskImportFromJsonApi.java b/src/main/java/neatlogic/module/process/api/processtask/datamigration/ProcessTaskImportFromJsonApi.java index 86edbae23db3eb926b2bfbb936e1532de1811d75..c12199a560133eb1bab7aa048b8ff4d278a321ea 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/datamigration/ProcessTaskImportFromJsonApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/datamigration/ProcessTaskImportFromJsonApi.java @@ -8,7 +8,6 @@ import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.ProcessStepType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.processtaskserialnumberpolicy.ProcessTaskSerialNumberPolicyHandlerNotFoundException; import neatlogic.framework.process.exception.processtaskserialnumberpolicy.ProcessTaskSerialNumberPolicyNotFoundException; @@ -20,9 +19,13 @@ import neatlogic.framework.restful.core.privateapi.PrivateJsonStreamApiComponent import neatlogic.framework.util.TimeUtil; import neatlogic.framework.worktime.dao.mapper.WorktimeMapper; import neatlogic.framework.worktime.dto.WorktimeVo; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONReader; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/neatlogic/module/process/api/processtask/fulltextindex/ProcessTaskFulltextIndexRebuildApi.java b/src/main/java/neatlogic/module/process/api/processtask/fulltextindex/ProcessTaskFulltextIndexRebuildApi.java index 62bf38461ce30848b74662b87359ac9a2888c738..008bea74b0b85fc1458677a28702aad22625e4e4 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/fulltextindex/ProcessTaskFulltextIndexRebuildApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/fulltextindex/ProcessTaskFulltextIndexRebuildApi.java @@ -22,7 +22,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.fulltextindex.core.FullTextIndexHandlerFactory; import neatlogic.framework.fulltextindex.core.IFullTextIndexHandler; import neatlogic.framework.process.auth.PROCESSTASK_MODIFY; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.fulltextindex.ProcessFullTextIndexType; import neatlogic.framework.restful.annotation.Input; diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskDeleteApi.java index fef5bd0c2dbc2442dc0b20ea1ecdc0ec376f0cbb..f26f2cdc2ed2c5ae25cc15d0cbb4ff0b088ac06c 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskDeleteApi.java @@ -20,8 +20,8 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepTaskUserVo; import neatlogic.framework.process.dto.ProcessTaskStepTaskVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -33,7 +33,7 @@ import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; import neatlogic.module.process.service.ProcessTaskService; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -58,7 +58,7 @@ public class ProcessTaskStepTaskDeleteApi extends PrivateApiComponentBase { @Resource ProcessTaskMapper processTaskMapper; @Resource - IProcessStepHandlerUtil IProcessStepHandlerUtil; + IProcessStepHandlerUtil processStepHandlerUtil; @Resource ProcessTaskService processTaskService; @@ -119,11 +119,11 @@ public class ProcessTaskStepTaskDeleteApi extends PrivateApiComponentBase { paramObj.put("replaceable_task", stepTaskVo.getTaskConfigName()); paramObj.put("source", jsonObj.getString("source")); processTaskStepVo.getParamObj().putAll(paramObj); - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.DELETETASK); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.DELETETASK); stepTaskVo.setStepTaskUserVoList(processTaskStepTaskUserList); processTaskStepVo.setProcessTaskStepTaskVo(stepTaskVo); - IProcessStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.DELETETASK); - IProcessStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.DELETETASK); + processStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.DELETETASK); + processStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.DELETETASK); return null; } } diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileDeleteApi.java index 382ca60a49413c09f961919b0d9c94ef118cd9f8..967faffa596aa9d3755bced67e79ccfe3e07fd23 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileDeleteApi.java @@ -24,14 +24,13 @@ import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; -import neatlogic.framework.process.crossover.IProcessTaskStepTaskCompleteApiCrossoverService; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.process.exception.processtask.task.ProcessTaskStepTaskNotFoundException; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileSaveApi.java index e109bf3c4ccbb7ccab8aba0000c7ee4a1dc2f962..d1199682de96e21e83e6989a7ed078031b5be580 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileSaveApi.java @@ -24,26 +24,21 @@ import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; -import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.crossover.IProcessTaskStepTaskCompleteApiCrossoverService; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.process.exception.processtask.task.ProcessTaskStepTaskNotFoundException; -import neatlogic.framework.process.notify.constvalue.ProcessTaskStepTaskNotifyTriggerType; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; -import neatlogic.framework.process.task.TaskConfigManager; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.process.service.ProcessTaskService; import neatlogic.module.process.service.ProcessTaskStepTaskService; import com.alibaba.fastjson.JSONObject; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskGetApi.java index f808ca89eb104198666c2dd197e241f15e5bf8ca..930d1487f9424fead950d86b6dfe6b4609dbe395 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskGetApi.java @@ -19,7 +19,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskStepNotFoundException; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskListApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskListApi.java index ed24d1859d93a4475340573951381437a15771cf..c334e2fe50e8e4d07f38e11a735f67bb191ef2dd 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskListApi.java @@ -19,7 +19,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.TaskConfigVo; import neatlogic.framework.process.exception.processtask.ProcessTaskStepNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskSaveApi.java index 67830f8da73c6544bb26694da74d33717718d580..cda5fd3c0e938356f83bd777f65e43aa86a10c30 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskSaveApi.java @@ -24,16 +24,16 @@ import neatlogic.framework.dto.UserVo; import neatlogic.framework.exception.type.ParamIrregularException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTaskMapper; -import neatlogic.framework.process.dao.mapper.task.TaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.process.exception.processtask.ProcessTaskStepNotFoundException; import neatlogic.framework.process.exception.processtask.task.*; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepTaskNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/processtask/test/ConverWorkcenterConditionConfigApi.java b/src/main/java/neatlogic/module/process/api/processtask/test/ConverWorkcenterConditionConfigApi.java index 9a9a671d80a8e6f242182a1e167a1ad0b551653b..7934ebf5713e7e867f0a1f35316f6dbb28efa6b3 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/test/ConverWorkcenterConditionConfigApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/test/ConverWorkcenterConditionConfigApi.java @@ -18,7 +18,7 @@ package neatlogic.module.process.api.processtask.test; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.workcenter.dto.WorkcenterVo; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.OperationType; diff --git a/src/main/java/neatlogic/module/process/api/processtask/test/RandomCreateProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/test/RandomCreateProcessTaskApi.java index 7ac8a1017d625a5ec9c6632f37140e30fbcd4b20..a1b5934da1d4a73d6a2795c157a5e80140cfc102 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/test/RandomCreateProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/test/RandomCreateProcessTaskApi.java @@ -25,9 +25,9 @@ import neatlogic.framework.dto.UserVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskStatus; import neatlogic.framework.process.constvalue.ProcessTaskStepUserStatus; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.PriorityMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; diff --git a/src/main/java/neatlogic/module/process/api/processtask/tmp/ProcessTaskMobileisFitApi.java b/src/main/java/neatlogic/module/process/api/processtask/tmp/ProcessTaskMobileisFitApi.java index e3fa704e8eba4aaa5abb26d0a51a972299187afe..ac15a4b00be79c3291954964fc08ac3a0dc1ace8 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/tmp/ProcessTaskMobileisFitApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/tmp/ProcessTaskMobileisFitApi.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessStepHandlerVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; diff --git a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateDeleteApi.java b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateDeleteApi.java index 8c038aa0f6f7a6a45e0877bd122192241d7b5841..362f3decf4f828b79b0efedce33fa058b1014da6 100755 --- a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateDeleteApi.java @@ -2,7 +2,7 @@ package neatlogic.module.process.api.score; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.exception.score.ScoreTemplateHasRefProcessException; import neatlogic.framework.process.exception.score.ScoreTemplateNotFoundException; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateGetApi.java b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateGetApi.java index 8cb68552b456f9f7dc6298938a001a07a010024d..c8e478e072a6c22b234c205e947076f86f901610 100755 --- a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateGetApi.java +++ b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateGetApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.score; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.score.ScoreTemplateVo; import neatlogic.framework.process.exception.score.ScoreTemplateNotFoundException; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateRefProcessListApi.java b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateRefProcessListApi.java index a46b55b6139f5bbd44289b1dccbc0b95b40daf51..f25c7eb548121b20623f1b89d8bd05b7cd5bffd7 100755 --- a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateRefProcessListApi.java +++ b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateRefProcessListApi.java @@ -5,7 +5,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.score.ScoreTemplateVo; import neatlogic.framework.process.exception.score.ScoreTemplateNotFoundException; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSaveApi.java b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSaveApi.java index bb626b397672579b7bfebde470dea349aba7f714..348188f13cb0ede9e4f9ec4cec0d393f1df80227 100755 --- a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSaveApi.java @@ -7,7 +7,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.dto.FieldValidResultVo; import neatlogic.framework.process.auth.SCORE_TEMPLATE_MODIFY; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.score.ScoreTemplateDimensionVo; import neatlogic.framework.process.dto.score.ScoreTemplateVo; import neatlogic.framework.process.exception.score.ScoreTemplateNameRepeatException; diff --git a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSearchApi.java b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSearchApi.java index 7937453b4d4ca76bbf5f145d5cb07faa67df3ab2..394e53c81585f75212eeffded753cdd1f21e4b56 100755 --- a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSearchApi.java @@ -4,7 +4,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.score.ScoreTemplateVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSearchForSelectApi.java b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSearchForSelectApi.java index c16f4d9936adbbb4d7a585e7f048a7e4e5353868..c5986af6b8410bc76d8fc55aa980528436dd970d 100755 --- a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSearchForSelectApi.java +++ b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateSearchForSelectApi.java @@ -5,7 +5,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.score.ScoreTemplateVo; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateStatusUpdateApi.java b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateStatusUpdateApi.java index 0d73554e9fa5f670385fd4d36b026bebaa5226aa..63a2f2ac557bdf1ad0a1b49489036492c5ed7e72 100755 --- a/src/main/java/neatlogic/module/process/api/score/ScoreTemplateStatusUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/score/ScoreTemplateStatusUpdateApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.score; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.score.ScoreTemplateVo; import neatlogic.framework.process.exception.score.ScoreTemplateHasRefProcessException; import neatlogic.framework.process.exception.score.ScoreTemplateNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/task/TaskDeleteApi.java b/src/main/java/neatlogic/module/process/api/task/TaskDeleteApi.java index 3dbea9c214a9f891bebb691ae87e7bff4578626a..caa329ac40bf96aada754d10efe5b59d3974f689 100755 --- a/src/main/java/neatlogic/module/process/api/task/TaskDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/task/TaskDeleteApi.java @@ -18,8 +18,8 @@ package neatlogic.module.process.api.task; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTaskMapper; -import neatlogic.framework.process.dao.mapper.task.TaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import neatlogic.framework.process.dto.TaskConfigVo; import neatlogic.framework.process.exception.processtask.task.TaskConfigIsInvokedException; import neatlogic.framework.process.exception.processtask.task.TaskConfigNotFoundException; diff --git a/src/main/java/neatlogic/module/process/api/task/TaskReferenceListApi.java b/src/main/java/neatlogic/module/process/api/task/TaskReferenceListApi.java index 126d36292fd5e0344f0d0329bc52ea1336a8b25e..a7bd0bfe36e9bd82b46a391c87e505bb339994fd 100755 --- a/src/main/java/neatlogic/module/process/api/task/TaskReferenceListApi.java +++ b/src/main/java/neatlogic/module/process/api/task/TaskReferenceListApi.java @@ -20,7 +20,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.task.TaskMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; diff --git a/src/main/java/neatlogic/module/process/api/task/TaskSaveApi.java b/src/main/java/neatlogic/module/process/api/task/TaskSaveApi.java index cf7f4502366cb30ba78aa10071c6cedf70187121..82d847d991ebfedebed9236d19c515101c2687fb 100644 --- a/src/main/java/neatlogic/module/process/api/task/TaskSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/task/TaskSaveApi.java @@ -19,7 +19,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.dto.FieldValidResultVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.task.TaskMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import neatlogic.framework.process.dto.TaskConfigVo; import neatlogic.framework.process.exception.processtask.task.TaskConfigButtonNameRepeatException; import neatlogic.framework.process.exception.processtask.task.TaskConfigNameRepeatException; diff --git a/src/main/java/neatlogic/module/process/api/task/TaskSearchApi.java b/src/main/java/neatlogic/module/process/api/task/TaskSearchApi.java index 23d71c03526cb9e18857527045c98ffb6115f51a..fed0ad80a5ae5ff76c57a94a485929c06f87a6f6 100755 --- a/src/main/java/neatlogic/module/process/api/task/TaskSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/task/TaskSearchApi.java @@ -18,7 +18,7 @@ package neatlogic.module.process.api.task; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.task.TaskMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import neatlogic.framework.process.dto.TaskConfigVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/GetWorkcenterApi.java b/src/main/java/neatlogic/module/process/api/workcenter/GetWorkcenterApi.java index c4f26c8c78e0bccac937e41db589c5773f6b5726..9c1b51ce64ec9133a095f624a3af8995e8579df2 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/GetWorkcenterApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/GetWorkcenterApi.java @@ -25,8 +25,8 @@ import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.form.dao.mapper.FormMapper; import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.exception.workcenter.WorkcenterNotFoundException; import neatlogic.framework.process.workcenter.dto.WorkcenterVo; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/ListWorkcenterApi.java b/src/main/java/neatlogic/module/process/api/workcenter/ListWorkcenterApi.java index 9dd6b21c9a26599e97fe0ae16744e3458d8dca62..47d08a2ea22e45f100a36deac39814c7735ac01a 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/ListWorkcenterApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/ListWorkcenterApi.java @@ -29,7 +29,7 @@ import neatlogic.framework.process.auth.WORKCENTER_MODIFY; import neatlogic.framework.process.auth.WORKCENTER_NEW_TYPE; import neatlogic.framework.process.constvalue.ProcessWorkcenterInitType; import neatlogic.framework.process.constvalue.ProcessWorkcenterType; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.workcenter.dto.WorkcenterUserProfileVo; import neatlogic.framework.process.workcenter.dto.WorkcenterVo; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/RenameWorkcenterApi.java b/src/main/java/neatlogic/module/process/api/workcenter/RenameWorkcenterApi.java index 036fa196a3c39d7436b959f42c762810960c597e..e61bb66b95c22a28716ee66b92d87e5e1dda91f4 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/RenameWorkcenterApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/RenameWorkcenterApi.java @@ -22,7 +22,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.auth.WORKCENTER_MODIFY; import neatlogic.framework.process.constvalue.ProcessWorkcenterType; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.exception.workcenter.WorkcenterNoModifyAuthException; import neatlogic.framework.process.exception.workcenter.WorkcenterNotFoundException; import neatlogic.framework.process.workcenter.dto.WorkcenterCatalogVo; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/SaveWorkcenterApi.java b/src/main/java/neatlogic/module/process/api/workcenter/SaveWorkcenterApi.java index 952039ea070a78ac9d36fe3e2b0f13f7ecf6ae87..8cc583bcc6211c49ca30cf1cd93959cad3668739 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/SaveWorkcenterApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/SaveWorkcenterApi.java @@ -23,7 +23,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.auth.WORKCENTER_MODIFY; import neatlogic.framework.process.constvalue.ProcessWorkcenterType; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.exception.workcenter.WorkcenterNoModifyAuthException; import neatlogic.framework.process.exception.workcenter.WorkcenterNotFoundException; import neatlogic.framework.process.exception.workcenter.WorkcenterParamException; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/SearchWorkcenterApi.java b/src/main/java/neatlogic/module/process/api/workcenter/SearchWorkcenterApi.java index 9bae1c1e6b8cf8b10f6ada429324a4ac09fe8901..c959ec35cf77717c074ea85f74eeb3792eab7d35 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/SearchWorkcenterApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/SearchWorkcenterApi.java @@ -19,7 +19,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.workcenter.dto.WorkcenterVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogDeleteApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogDeleteApi.java index dfe438d29e383cbd29ed70c033678df1f804ff8d..070342441a68ffffb962f345e61a1268064a4e94 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogDeleteApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.workcenter; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.exception.workcenter.WorkcenterCatalogIdNotFoundException; import neatlogic.framework.process.exception.workcenter.WorkcenterCatalogIsUsedException; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogListApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogListApi.java index 4a45020c2a110570255a4905820ab5bca3181a97..54ddee99ccfe02b3f6f8871f9e9b11458cea81d8 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogListApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogListApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.workcenter; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.workcenter.dto.WorkcenterCatalogVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogSaveApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogSaveApi.java index 987d57f6c243b26ce97789b6654d9c5473d80a8a..c6f2e579a26b371bd2150a154a3f69e2bd065522 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterCatalogSaveApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.workcenter; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.exception.workcenter.WorkcenterCatalogIdNotFoundException; import neatlogic.framework.process.exception.workcenter.WorkcenterCatalogNameRepeatsException; import neatlogic.framework.process.workcenter.dto.WorkcenterCatalogVo; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterConditionSaveApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterConditionSaveApi.java index 7f0ee673dbaa0d9e0125fb8f9e9ed8c95b9da67a..18daf113bc2bcc09517d0181680f65da02e0ff35 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterConditionSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterConditionSaveApi.java @@ -22,7 +22,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.auth.WORKCENTER_MODIFY; import neatlogic.framework.process.constvalue.ProcessWorkcenterType; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.exception.workcenter.WorkcenterCanNotEditFactoryException; import neatlogic.framework.process.exception.workcenter.WorkcenterNoCustomAuthException; import neatlogic.framework.process.exception.workcenter.WorkcenterNoModifyAuthException; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportApi.java index 460d524507da15b93713919f72fa783e67c43422..be9280f3f6b57f338aa83c98bad3f0ec3c50d172 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportApi.java @@ -29,8 +29,8 @@ import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnFactory; import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessFormVo; import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskVo; @@ -42,7 +42,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateBinaryStreamApiComponentBase; import neatlogic.framework.util.$; import neatlogic.framework.util.FileUtil; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.service.NewWorkcenterService; import neatlogic.module.process.service.ProcessTaskService; import neatlogic.module.process.sql.decorator.SqlBuilder; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportToCSVApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportToCSVApi.java index f2e7689345d73e207944cbfa6db28fc11a3aa93e..92e2556adebccb48551ca064f11d0cfac454435b 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportToCSVApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportToCSVApi.java @@ -22,8 +22,8 @@ import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnFactory; import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.workcenter.dto.WorkcenterTheadVo; import neatlogic.framework.process.workcenter.dto.WorkcenterVo; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDeleteApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDeleteApi.java index da1a89295d9d4499d68294a539287e5905609c24..ae67fcd1211064088fda04665f12b8131f3eb481 100755 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDeleteApi.java @@ -7,7 +7,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.auth.WORKCENTER_MODIFY; import neatlogic.framework.process.constvalue.ProcessWorkcenterType; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.exception.workcenter.WorkcenterCanNotEditFactoryException; import neatlogic.framework.process.exception.workcenter.WorkcenterNoCustomAuthException; import neatlogic.framework.process.exception.workcenter.WorkcenterNoModifyAuthException; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterKeywordSearchApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterKeywordSearchApi.java index ee7dd20c50cf5e8c05dac780cd1ced3b84e118f7..abd059e73b4404e1ad3422c129da00035e43fe0a 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterKeywordSearchApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterKeywordSearchApi.java @@ -21,7 +21,7 @@ import neatlogic.framework.common.constvalue.Expression; import neatlogic.framework.common.dto.BaseEditorVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.condition.core.IProcessTaskCondition; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.workcenter.dto.WorkcenterVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterSaveAuthApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterSaveAuthApi.java index 73935f55346fa522eb52703a7e4c34c653d137a2..2100319281deb620aabfe8be7ca369e918e42f5a 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterSaveAuthApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterSaveAuthApi.java @@ -23,7 +23,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.auth.WORKCENTER_MODIFY; import neatlogic.framework.process.constvalue.ProcessWorkcenterType; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.exception.workcenter.WorkcenterNoModifyAuthException; import neatlogic.framework.process.exception.workcenter.WorkcenterNotFoundException; import neatlogic.framework.process.exception.workcenter.WorkcenterParamException; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterTheadSaveApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterTheadSaveApi.java index fc520d7d71ce674902b6f76f6b128715d1a4e490..964c39211e4cea1ab9325b722b9cefcd5bdd754b 100755 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterTheadSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterTheadSaveApi.java @@ -4,7 +4,7 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.workcenter.dto.WorkcenterTheadVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterUserProfileSaveApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterUserProfileSaveApi.java index e415408411a7f334a692f8c3ffc2667ab46983a7..f0de053153e1537a7e2f7b5753024fb2eadcf370 100755 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterUserProfileSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterUserProfileSaveApi.java @@ -4,7 +4,7 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.exception.workcenter.WorkcenterParamException; import neatlogic.framework.process.workcenter.dto.WorkcenterUserProfileVo; import neatlogic.framework.restful.annotation.*; diff --git a/src/main/java/neatlogic/module/process/api/workcenter/elasticsearch/EsProcessTaskSyncApi.java b/src/main/java/neatlogic/module/process/api/workcenter/elasticsearch/EsProcessTaskSyncApi.java index 3ceb5f1fcdd7c94e31dc0e667e6cb0df77cd506c..787f0bf8a244bf66bc02ab7a0c6c8257ae216faa 100755 --- a/src/main/java/neatlogic/module/process/api/workcenter/elasticsearch/EsProcessTaskSyncApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/elasticsearch/EsProcessTaskSyncApi.java @@ -3,7 +3,7 @@ package neatlogic.module.process.api.workcenter.elasticsearch; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; diff --git a/src/main/java/neatlogic/module/process/audithandler/handler/ChannelTypeRelationAuditHandler.java b/src/main/java/neatlogic/module/process/audithandler/handler/ChannelTypeRelationAuditHandler.java index e805d0936fb2cd01c3633221b97c900779564161..79877d47280f451188a74884f2ef16c0220381e3 100755 --- a/src/main/java/neatlogic/module/process/audithandler/handler/ChannelTypeRelationAuditHandler.java +++ b/src/main/java/neatlogic/module/process/audithandler/handler/ChannelTypeRelationAuditHandler.java @@ -1,7 +1,7 @@ package neatlogic.module.process.audithandler.handler; import neatlogic.framework.process.audithandler.core.IProcessTaskStepAuditDetailHandler; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; diff --git a/src/main/java/neatlogic/module/process/audithandler/handler/FormAuditHandler.java b/src/main/java/neatlogic/module/process/audithandler/handler/FormAuditHandler.java index 87b5fd0e2f0fdca3bf6cc44a3c06c8aadf782e5d..7612e834dc75718fe599d57447e3aa58561f9748 100644 --- a/src/main/java/neatlogic/module/process/audithandler/handler/FormAuditHandler.java +++ b/src/main/java/neatlogic/module/process/audithandler/handler/FormAuditHandler.java @@ -8,8 +8,8 @@ import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.form.dto.FormVersionVo; import neatlogic.framework.process.audithandler.core.IProcessTaskStepAuditDetailHandler; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskAuditFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskFormVo; diff --git a/src/main/java/neatlogic/module/process/audithandler/handler/PriorityAuditHandler.java b/src/main/java/neatlogic/module/process/audithandler/handler/PriorityAuditHandler.java index c13078b0323c202bf4501dd8a6c7f2de5dcf6ffc..51afc0b1680d5e12b389f8f83c25c962f01b8d56 100755 --- a/src/main/java/neatlogic/module/process/audithandler/handler/PriorityAuditHandler.java +++ b/src/main/java/neatlogic/module/process/audithandler/handler/PriorityAuditHandler.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSON; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.process.dto.ProcessTaskStepAuditDetailVo; @Service diff --git a/src/main/java/neatlogic/module/process/audithandler/handler/ProcessTaskAuditHandler.java b/src/main/java/neatlogic/module/process/audithandler/handler/ProcessTaskAuditHandler.java index 79bee5e14133659b8758fcb2f1360fd786527732..e81021b3cac5d85a753d88e63001ca0146e05a80 100755 --- a/src/main/java/neatlogic/module/process/audithandler/handler/ProcessTaskAuditHandler.java +++ b/src/main/java/neatlogic/module/process/audithandler/handler/ProcessTaskAuditHandler.java @@ -1,15 +1,15 @@ package neatlogic.module.process.audithandler.handler; import neatlogic.framework.process.audithandler.core.IProcessTaskStepAuditDetailHandler; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessTaskStepAuditDetailVo; diff --git a/src/main/java/neatlogic/module/process/audithandler/handler/ProcessTaskListAuditHandler.java b/src/main/java/neatlogic/module/process/audithandler/handler/ProcessTaskListAuditHandler.java index 1f32d90766008c00188050118062c4a46f6b12c9..0b1ce48f1fce85b508f278b14280425a0bd5b78a 100755 --- a/src/main/java/neatlogic/module/process/audithandler/handler/ProcessTaskListAuditHandler.java +++ b/src/main/java/neatlogic/module/process/audithandler/handler/ProcessTaskListAuditHandler.java @@ -3,7 +3,7 @@ package neatlogic.module.process.audithandler.handler; import java.util.List; import neatlogic.framework.process.audithandler.core.IProcessTaskStepAuditDetailHandler; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,8 +12,8 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessTaskStepAuditDetailVo; diff --git a/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoApprovalHandler.java b/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoApprovalHandler.java index 0047cf4bb11db26537acada3c0c2fc47b73619f6..e0c090cad4a7c0ee85bb5a9a0e0f8e0efa17d241 100644 --- a/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoApprovalHandler.java +++ b/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoApprovalHandler.java @@ -23,10 +23,10 @@ import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.dto.UserVo; import neatlogic.framework.process.autocompleterule.core.IAutoCompleteRuleHandler; import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; -import neatlogic.framework.process.service.ProcessTaskAgentService; +import neatlogic.module.process.service.ProcessTaskAgentService; import neatlogic.framework.process.stephandler.core.*; import neatlogic.framework.service.AuthenticationInfoService; import org.apache.commons.collections4.CollectionUtils; diff --git a/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoCompleteHandler.java b/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoCompleteHandler.java index e0c48d650862f8d32e5cfae235813bab03d181be..c378680329f9e136619a275e1c99abda771fe0c8 100644 --- a/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoCompleteHandler.java +++ b/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoCompleteHandler.java @@ -26,7 +26,7 @@ import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepInOperationVo; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskChannelCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskChannelCondition.java index f135ce01c96aa60ce291821d0b64f82a6be683d8..55457d151762fccdf5d25e93bb1326c0d4d059a2 100755 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskChannelCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskChannelCondition.java @@ -8,7 +8,7 @@ import neatlogic.framework.process.condition.core.IProcessTaskCondition; import neatlogic.framework.process.condition.core.ProcessTaskConditionBase; import neatlogic.framework.process.constvalue.ConditionConfigType; import neatlogic.framework.process.constvalue.ProcessFieldType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.workcenter.table.ProcessTaskSqlTable; import com.alibaba.fastjson.JSON; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskChannelTypeCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskChannelTypeCondition.java index 16e0f93e2dc75f5688d800d94df1fb2dfbd4384a..f6ece1ebb8337020f382c2004472b88099e0651d 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskChannelTypeCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskChannelTypeCondition.java @@ -1,5 +1,8 @@ package neatlogic.module.process.condition.handler; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.FormHandlerType; import neatlogic.framework.common.constvalue.ParamType; import neatlogic.framework.common.dto.ValueTextVo; @@ -9,15 +12,13 @@ import neatlogic.framework.process.condition.core.IProcessTaskCondition; import neatlogic.framework.process.condition.core.ProcessTaskConditionBase; import neatlogic.framework.process.constvalue.ConditionConfigType; import neatlogic.framework.process.constvalue.ProcessFieldType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.workcenter.dto.JoinTableColumnVo; import neatlogic.framework.process.workcenter.table.ChannelTypeSqlTable; import neatlogic.framework.process.workcenter.table.util.SqlTableUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -27,6 +28,9 @@ import java.util.List; @Component public class ProcessTaskChannelTypeCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; + @Resource private ChannelTypeMapper channelTypeMapper; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskContentCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskContentCondition.java index 8ef7e6a55b1512f249acca2acf55a9bc02e2edd1..ca714206b147a9f8c011fc0c4754b27c23230f2b 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskContentCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskContentCondition.java @@ -11,14 +11,18 @@ import neatlogic.framework.process.constvalue.ConditionConfigType; import neatlogic.framework.process.constvalue.ProcessFieldType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Arrays; import java.util.List; @Component public class ProcessTaskContentCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; @Override public String getName() { diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java index b1a5b71b47d17479941f11c3856dc8a9c55adfb4..24db32f963fff4257d075829f77ff4021c0e3615 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java @@ -37,13 +37,14 @@ import neatlogic.framework.process.condition.core.ProcessTaskConditionBase; import neatlogic.framework.process.constvalue.ConditionConfigType; import neatlogic.framework.process.constvalue.ProcessFieldType; import neatlogic.framework.process.constvalue.ProcessWorkcenterField; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskFormVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.util.FormUtil; import neatlogic.framework.util.Md5Util; import neatlogic.framework.util.TimeUtil; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.service.ProcessTaskService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; @@ -57,6 +58,9 @@ import java.util.*; @Component public class ProcessTaskFormAttributeCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; + @Resource private SelectContentByHashMapper selectContentByHashMapper; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerCompanyCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerCompanyCondition.java index 03d39419c601762ab1c385043907c535c3b327be..4359a651790e3f1f36fabcb3f88aef25547de6c0 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerCompanyCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerCompanyCondition.java @@ -15,11 +15,13 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -28,6 +30,9 @@ import java.util.Set; @Component public class ProcessTaskOwnerCompanyCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; + @Autowired private TeamMapper teamMapper; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerCondition.java index ac9953ea1c406e88d39f4378d4d1fb16cd160170..3c3b0a5db014661297d834d612b6d2dc32a95f49 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerCondition.java @@ -31,10 +31,12 @@ import neatlogic.framework.process.constvalue.ProcessFieldType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.workcenter.table.ProcessTaskSqlTable; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -43,6 +45,9 @@ import java.util.stream.Collectors; @Component public class ProcessTaskOwnerCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; + @Autowired private UserMapper userMapper; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerDepartmentCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerDepartmentCondition.java index 1d76c43f1f59ba3ea67089ed68e1d0c1a40ed3ea..74be7058f21b3ed324816ed122800e04fe8ec261 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerDepartmentCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerDepartmentCondition.java @@ -30,11 +30,13 @@ import neatlogic.framework.process.constvalue.ConditionConfigType; import neatlogic.framework.process.constvalue.ProcessFieldType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -43,6 +45,9 @@ import java.util.Set; @Component public class ProcessTaskOwnerDepartmentCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; + @Autowired private TeamMapper teamMapper; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerLevelCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerLevelCondition.java index 94a75e5b846c8c0022cad71549c4ab4ee10a5c80..2b5511de2dcab188746cb14d160526e00d1e01d8 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerLevelCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerLevelCondition.java @@ -14,14 +14,18 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.List; import java.util.Objects; @Component public class ProcessTaskOwnerLevelCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; @Override public String getName() { diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerRoleCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerRoleCondition.java index f51d1dd327f08d5fd8ab44b4ef485b90534c41a4..5d708760e697c492ae7c3a0fe66a59009faab1b4 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerRoleCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskOwnerRoleCondition.java @@ -17,6 +17,7 @@ import neatlogic.framework.process.dto.ProcessTaskVo; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -27,6 +28,9 @@ import java.util.stream.Collectors; @Component public class ProcessTaskOwnerRoleCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; + @Resource private RoleMapper roleMapper; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskPriorityCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskPriorityCondition.java index acec14eb2148079859f4f3fc01949e629405f5b4..24bdf7fb690e7ebbdf2af2e0e9077821655f15c3 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskPriorityCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskPriorityCondition.java @@ -9,7 +9,7 @@ import neatlogic.framework.process.condition.core.ProcessTaskConditionBase; import neatlogic.framework.form.constvalue.FormConditionModel; import neatlogic.framework.process.constvalue.ConditionConfigType; import neatlogic.framework.process.constvalue.ProcessFieldType; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; @@ -17,14 +17,19 @@ import neatlogic.framework.process.workcenter.table.ProcessTaskSqlTable; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @Component public class ProcessTaskPriorityCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; + @Autowired private PriorityMapper priorityMapper; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskStartTimeCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskStartTimeCondition.java index 6bb02628087d459dbc7a19d06c6ef58425e011ac..f89612100b82d5f15bb3fe4b3af4ca9b158a9816 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskStartTimeCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskStartTimeCondition.java @@ -13,8 +13,10 @@ import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.workcenter.table.ProcessTaskSqlTable; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -25,6 +27,9 @@ public class ProcessTaskStartTimeCondition extends ProcessTaskConditionBase impl private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + @Resource + private ProcessTaskMapper processTaskMapper; + @Override public String getName() { return "starttime"; diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskTitleCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskTitleCondition.java index 8681b6678a78c5e62a1b4aa5e3e5f2e63be38cbd..20a7d41f6366fc13433c0d6ca52af2ca6e668ac6 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskTitleCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskTitleCondition.java @@ -12,13 +12,18 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.workcenter.table.ProcessTaskSqlTable; import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.List; @Component public class ProcessTaskTitleCondition extends ProcessTaskConditionBase implements IProcessTaskCondition { + @Resource + private ProcessTaskMapper processTaskMapper; + @Override public String getName() { return "title"; diff --git a/src/main/java/neatlogic/module/process/dao/mapper/SelectContentByHashMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/SelectContentByHashMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ec41da2744d14a88f008be3611351841f8d8da09 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/SelectContentByHashMapper.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper; + +import neatlogic.framework.process.crossover.ISelectContentByHashCrossoverMapper; +import neatlogic.framework.process.dto.ProcessTaskConfigVo; +import neatlogic.framework.process.dto.ProcessTaskContentVo; + +import java.util.List; + +public interface SelectContentByHashMapper extends ISelectContentByHashCrossoverMapper { + + String getProcessTaskStepConfigByHash(String hash); + + ProcessTaskContentVo getProcessTaskContentByHash(String hash); + + List getProcessTaskContentListByHashList(List contentHashList); + + String getProcessTaskContentStringByHash(String hash); + + String getProcessTaskFromContentByHash(String hash); + + String getProcessTaskFromContentByProcessTaskId(Long processTaskId); + +// int getProcessTaskFromContentCountByHash(String hash); + + int checkProcessTaskScoreTempleteConfigIsExists(String hash); + + String getProcessTaskScoreTempleteConfigStringIsByHash(String hash); + + String getProcessTaskConfigStringByHash(String configHash); + + List getProcessTaskConfigListByHashList(List configHashList); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/SelectContentByHashMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/SelectContentByHashMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..921697248e75c33cf5b77cd40f2b2da53384a0d0 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/SelectContentByHashMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ede9876538608501a41255b45b0c5c17672878a4 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.catalog; + +import neatlogic.framework.dto.AuthorityVo; +import neatlogic.framework.process.crossover.ICatalogCrossoverMapper; +import neatlogic.framework.process.dto.CatalogVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface CatalogMapper extends ICatalogCrossoverMapper { + + List getCatalogList(CatalogVo catalogVo); + + CatalogVo getCatalogByUuid(String uuid); + + int checkCatalogIsExists(String catalogUuid); + + List getHasActiveChannelCatalogUuidList(List channelUuidList); + + int checkCatalogNameIsRepeat(CatalogVo catalogVo); + + List getCatalogListForTree(@Param("lft") Integer lft, @Param("rht") Integer rht); + + List getCatalogAuthorityListByCatalogUuid(String uuid); + + List getAuthorizedCatalogUuidList( + @Param("userUuid")String userUuid, + @Param("teamUuidList")List teamUuidList, + @Param("roleUuidList")List roleUuidList, + @Param("catalogUuid") String catalogUuid + ); + + List getAuthorizedCatalogUuidListByCatalogUuidList( + @Param("userUuid")String userUuid, + @Param("teamUuidList")List teamUuidList, + @Param("roleUuidList")List roleUuidList, + @Param("catalogUuidList") List catalogUuid + ); + +// String getCatalogLockByUuid(String uuid); + + List getCatalogListByParentUuid(String parentUuid); + +// int checkCatalogIsExistsByLeftRightCode(@Param("uuid")String uuid, @Param("lft") Integer lft, @Param("rht") Integer rht); + +// int getCatalogCount(CatalogVo catalogVo); + + int getCatalogCountOnLock(); + /** + * + * @Time:2020年7月7日 + * @Description: 根据左右编码查出目录及所有上级目录 + * @param lft 左编码 + * @param rht 右编码 + * @return List + */ + List getAncestorsAndSelfByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht); + + List getUpwardUuidListByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht); + + List getDownwardUuidListByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht); + /** + * 根据父uuid获取授权的子服务目录列表 + * @param uuid + * @return List + */ + List getAuthorizedCatalogList( + @Param("userUuid")String userUuid, + @Param("teamUuidList")List teamUuidList, + @Param("roleUuidList")List roleUuidList, + @Param("parentUuid") String parentUuid, + @Param("uuid") String uuid + ); + + Integer getMaxRhtCode(); + + /** + * + * @Time:2020年7月20日 + * @Description: 判断左右编码是否全部正确，符合下列条件的才正确 + * 1.左右编码不能为null + * 2.左编码不能小于2，右编码不能小于3 + * 3.子节点的左编码大于父节点的左编码，子节点的右编码小于父节点的右编码 + * 4.没有子节点的节点左编码比右编码小1 + * @return int 返回左右编码不正确的个数 + */ +// int checkLeftRightCodeIsWrong(); + + List getCatalogUuidListByLftRht(@Param("lft") Integer lft, @Param("rht")Integer rht); + + String getParentUuidByUuid(String uuid); + +// List getCatalogByName(String name); + + List getCatalogListByUuidList(List uuidList); + + int insertCatalog(CatalogVo catalogVo); + + int insertCatalogAuthority(@Param("authorityVo")AuthorityVo authorityVo,@Param("catalogUuid")String catalogUuid); + +// int updateCatalogParentUuidByUuid(CatalogVo catalogVo); + + int updateCatalogLeftRightCode(@Param("uuid") String uuid, @Param("lft") int lft, @Param("rht") int rht); + +// int batchUpdateCatalogLeftRightCodeByLeftRightCode(@Param("lft") Integer lft, @Param("rht") Integer rht, @Param("step") int step); + +// int batchUpdateCatalogLeftCode(@Param("minCode") Integer minCode, @Param("step") int step); + +// int batchUpdateCatalogRightCode(@Param("minCode") Integer minCode, @Param("step") int step); + + int updateCatalogByUuid(CatalogVo catalogVo); + + int deleteCatalogByUuid(String uuid); + + int deleteCatalogAuthorityByCatalogUuid(String uuid); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..1bfd73ebc1299e6e0309421a4afae7cc253c7cf8 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml @@ -0,0 +1,406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO `catalog`(`uuid`, `name`, `parent_uuid`, `is_active`, `icon`, `color`, `desc`, `lft`, `rht`) + VALUES(#{uuid}, #{name}, #{parentUuid}, #{isActive}, #{icon}, #{color}, #{desc}, #{lft}, #{rht}) + + + + INSERT INTO `catalog_authority` ( + `catalog_uuid`, + `type`, + `uuid` + ) + VALUES + ( + #{catalogUuid}, + #{authorityVo.type}, + #{authorityVo.uuid} + ) + + + + + + UPDATE `catalog` SET `lft` = #{lft}, `rht` = #{rht} WHERE `uuid` = #{uuid} + + + + + + + + + + UPDATE `catalog` + SET + `name` = #{name}, + `parent_uuid` = #{parentUuid}, + `is_active` = #{isActive}, + `icon` = #{icon}, + `color` = #{color}, + `desc` = #{desc} + WHERE `uuid` = #{uuid} + + + + DELETE FROM `catalog` WHERE `uuid` = #{uuid} + + + + DELETE FROM `catalog_authority` WHERE `catalog_uuid` = #{catalogUuid} + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..48281ae044e4ea7f4801a2c6b84bec5731f4f66b --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.java @@ -0,0 +1,154 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.catalog; + +import neatlogic.framework.common.dto.ValueTextVo; +import neatlogic.framework.dto.AuthorityVo; +import neatlogic.framework.form.dto.FormAttributeVo; +import neatlogic.framework.form.dto.FormVersionVo; +import neatlogic.framework.process.crossover.IChannelCrossoverMapper; +import neatlogic.framework.process.dto.*; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ChannelMapper extends IChannelCrossoverMapper { + + int searchChannelCount(ChannelVo channelVo); + + List searchChannelList(ChannelVo channelVo); + + List getAllChannelList(); + + List searchChannelListForSelect(ChannelVo channelVo); + + ChannelVo getChannelByUuid(String channelUuid); + + ChannelVo getChannelByName(String channelName); + + List getChannelByUuidList(@Param("channelUuidList") List channelUuidList); + + List getChannelVoByUuidList(List uuidList); + + List getChannelUuidListByParentUuidList(List parentUuidList); + + List getAllChannelPriorityList(); + + int getMaxSortByParentUuid(String parentUuid); + + List getChannelPriorityListByChannelUuid(String uuid); + + int checkChannelIsExists(String channelUuid); + + int checkChannelNameIsRepeat(ChannelVo channelVo); + + List getChannelListForTree(Integer isActive); + + String getProcessUuidByChannelUuid(String channelUuid); + + String getWorktimeUuidByChannelUuid(String channelUuid); + + List getChannelAuthorityListByChannelUuid(String uuid); + + List getAuthorizedChannelUuidList(@Param("userUuid") String userUuid, + @Param("teamUuidList") List teamUuidList, @Param("roleUuidList") List roleUuidList, + @Param("channelUuid") String channelUuid); + + List getActiveAuthorizedChannelUuidList(@Param("userUuid") String userUuid, + @Param("teamUuidList") List teamUuidList, @Param("roleUuidList") List roleUuidList, + @Param("channelUuid") String channelUuid); + + List getAuthorizedChannelListByParentUuid(@Param("userUuid") String userUuid, + @Param("teamUuidList") List teamUuidList, @Param("roleUuidList") List roleUuidList, + @Param("parentUuid") String parentUuid); + + List getAllAncestorNameListByParentUuid(String parentUuid); + + int checkChannelIsFavorite(@Param("userUuid") String userUuid, @Param("channelUuid") String channelUuid); + + List getChannelListByChannelTypeUuidList(List channelTypeUuidList); + + List getChannelListByChannelUuidList(List channelUuidList); + + List getChannelRelationListBySource(String channelUuid); + + List getChannelRelationAuthorityListBySource(String channelUuid); + + List getChannelRelationTargetList(ChannelRelationVo channelRelationVo); + + List getFavoriteChannelList(ChannelVo channelVo); + + FormVersionVo getFormVersionByChannelUuid(String channelUuid); + + List getFormAttributeByChannelUuid(String channelUuid); + + List getFormUuidListByChannelUuidList(List channelUuidList); + + Integer getChannelRelationIsUsePreOwnerBySourceAndChannelTypeRelationId(ChannelRelationVo channelRelationVo); + + int replaceChannelUser(@Param("userUuid") String userUuid, @Param("channelUuid") String channelUuid); + + int replaceChannel(ChannelVo channelVo); + + int insertChannelPriority(ChannelPriorityVo channelPriority); + + int replaceChannelProcess(@Param("channelUuid") String channelUuid, + @Param("processUuid") String processUuid); + + int replaceChannelWorktime(@Param("channelUuid") String channelUuid, + @Param("worktimeUuid") String worktimeUuid); + + int insertChannelAuthority(@Param("authorityVo") AuthorityVo authority, + @Param("channelUuid") String channelUuid); + + int insertChannelRelation(ChannelRelationVo channelRelationVo); + + int insertChannelRelationAuthority(ChannelRelationVo channelRelationVo); + + int insertChannelRelationIsUsePreOwner(ChannelRelationVo channelRelationVo); + + int updateChannelForMove(ChannelVo channelVo); + + int updateSortIncrement(@Param("parentUuid") String parentUuid, @Param("fromSort") Integer fromSort, + @Param("toSort") Integer toSort); + + int updateSortDecrement(@Param("parentUuid") String parentUuid, @Param("fromSort") Integer fromSort, + @Param("toSort") Integer toSort); + + int updateChannelConfig(ChannelVo channelVo); + + int deleteChannelUser(@Param("userUuid") String userUuid, @Param("channelUuid") String channelUuid); + + int deleteChannelByUuid(String uuid); + + int deleteChannelPriorityByChannelUuid(String channelUuid); + + int deleteChannelProcessByChannelUuid(String channelUuid); + + int deleteChannelWorktimeByChannelUuid(String channelUuid); + + int deleteChannelUserByChannelUuid(String channelUuid); + + int deleteChannelAuthorityByChannelUuid(String uuid); + + int deleteChannelRelationBySource(String channelUuid); + + int deleteChannelRelationAuthorityBySource(String channelUuid); + + int deleteChannelRelationIsUsePreOwnerBySource(String channelUuid); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..56dd17318fe13474676ec502cefad0d72a02d3d1 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.xml @@ -0,0 +1,873 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + REPLACE INTO `channel` (`uuid`, + `name`, + `parent_uuid`, + `is_active`, + `icon`, + `color`, + `desc`, + `sort`, + `sla`, + `allow_desc`, + `help`, + `is_active_help`, + `channel_type_uuid`, + `support`, + `config`) + VALUES (#{uuid}, + #{name}, + #{parentUuid}, + #{isActive}, + #{icon}, + #{color}, + #{desc}, + #{sort}, + #{sla}, + #{allowDesc}, + #{help}, + #{isActiveHelp}, + #{channelTypeUuid}, + #{support}, + #{configStr}) + + + + REPLACE INTO `channel_user`(`user_uuid`, `channel_uuid`, `insert_time`) + VALUES (#{userUuid}, #{channelUuid}, now(3)) + + + + INSERT INTO `channel_priority`(`channel_uuid`, `priority_uuid`, `is_default`) + VALUES (#{channelUuid}, #{priorityUuid}, #{isDefault}) + + + + REPLACE INTO `channel_process`(`channel_uuid`, `process_uuid`) + VALUES (#{channelUuid}, #{processUuid}) + + + + INSERT INTO `channel_authority` (`channel_uuid`, + `type`, + `uuid`) + VALUES (#{channelUuid}, + #{authorityVo.type}, + #{authorityVo.uuid}) + + + + REPLACE INTO `channel_worktime`(`channel_uuid`, `worktime_uuid`) + VALUES (#{channelUuid}, #{worktimeUuid}) + + + + INSERT INTO `channel_relation` (`source`, + `channel_type_relation_id`, + `type`, + `target`) + VALUES (#{source}, + #{channelTypeRelationId}, + #{type}, + #{target}) + + + + INSERT INTO `channel_relation_authority` (`source`, + `channel_type_relation_id`, + `type`, + `uuid`) + VALUES (#{source}, + #{channelTypeRelationId}, + #{type}, + #{uuid}) + + + + INSERT INTO `channel_relation_isusepreowner` (`source`, + `channel_type_relation_id`, + `is_use_pre_owner`) + VALUES (#{source}, + #{channelTypeRelationId}, + #{isUsePreOwner}) + + + + UPDATE `channel` + SET `parent_uuid` = #{parentUuid}, + `sort` = #{sort} + WHERE `uuid` = #{uuid} + + + + UPDATE `channel` SET `sort` = `sort` + 1 + WHERE `parent_uuid` = #{parentUuid} + AND `sort` >= #{fromSort} + + AND `sort` <= #{toSort} + + + + + UPDATE `channel` SET `sort` = `sort` - 1 + WHERE `parent_uuid` = #{parentUuid} + AND `sort` >= #{fromSort} + + AND `sort` <= #{toSort} + + + + + UPDATE `channel` + SET `config` = #{configStr} + WHERE `uuid` = #{uuid} + + + + DELETE + FROM `channel_user` + WHERE `user_uuid` = #{userUuid} + AND `channel_uuid` = #{channelUuid} + + + + DELETE + FROM `channel` + WHERE `uuid` = #{uuid} + + + + DELETE + FROM `channel_priority` + WHERE `channel_uuid` = #{channelUuid} + + + + DELETE + FROM `channel_process` + WHERE `channel_uuid` = #{channelUuid} + + + + DELETE + FROM `channel_worktime` + WHERE `channel_uuid` = #{channelUuid} + + + + DELETE + FROM `channel_user` + WHERE `channel_uuid` = #{channelUuid} + + + + DELETE + FROM `channel_authority` + WHERE `channel_uuid` = #{channelUuid} + + + + DELETE + FROM `channel_relation` + WHERE `source` = #{value} + + + + DELETE + FROM `channel_relation_authority` + WHERE `source` = #{value} + + + DELETE + FROM `channel_relation_isusepreowner` + WHERE `source` = #{value} + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelTypeMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelTypeMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..1971e57da453ff29850612112863906365e32cff --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelTypeMapper.java @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.catalog; + +import neatlogic.framework.common.dto.ValueTextVo; +import neatlogic.framework.process.crossover.IChannelTypeCrossoverMapper; +import neatlogic.framework.process.dto.ChannelTypeRelationChannelVo; +import neatlogic.framework.process.dto.ChannelTypeRelationVo; +import neatlogic.framework.process.dto.ChannelTypeVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Set; + +/** + * @Title: ChannelTypeMapper + * @Package neatlogic.framework.process.dao.mapper + * @Description: TODO + * @Author: linbq + * @Date: 2021/1/29 18:24 + + **/ +public interface ChannelTypeMapper extends IChannelTypeCrossoverMapper { + + int searchChannelTypeCount(ChannelTypeVo channelTypeVo); + + List searchChannelTypeList(ChannelTypeVo channelTypeVo); + + List searchChannelTypeListForSelect(ChannelTypeVo channelTypeVo); + + ChannelTypeVo getChannelTypeByUuid(String uuid); + + List getChannelTypeByUuidList(List uuidList); + + int checkChannelTypeIsExists(String uuid); + + int checkChannelTypeNameIsRepeat(ChannelTypeVo channelTypeVo); + + Integer getChannelTypeMaxSort(); + + int checkChannelTypeRelationIsExists(Long id); + + int checkChannelTypeRelationNameIsRepeat(ChannelTypeRelationVo channelTypeRelationVo); + + ChannelTypeRelationVo getChannelTypeRelationById(Long channelTypeRelationId); + + ChannelTypeRelationVo getChannelTypeRelationLockById(Long channelTypeRelationId); + + List getChannelTypeRelationList(ChannelTypeRelationVo channelTypeRelationVo); + + int getChannelTypeRelationCount(ChannelTypeRelationVo channelTypeRelationVo); + + List getChannelTypeRelationListForSelect(ChannelTypeRelationVo channelTypeRelationVo); + + int getChannelTypeRelationCountForSelect(ChannelTypeRelationVo channelTypeRelationVo); + + List getChannelTypeRelationSourceListByChannelTypeRelationId(Long channelTypeRelationId); + + List getChannelTypeRelationTargetListByChannelTypeRelationId(Long channelTypeRelationId); + + List + getChannelTypeRelationSourceListByChannelTypeRelationIdList(List channelTypeRelationIdList); + + List getChannelTypeRelationTargetListByChannelTypeRelationIdList(List channelTypeRelationIdList); + + List getChannelTypeRelationIdListBySourceChannelTypeUuid(String sourceChannelTypeUuid); + + List getAuthorizedChannelTypeRelationIdListBySourceChannelUuid( + @Param("source") String source, + @Param("userUuid") String userUuid, + @Param("teamUuidList") List teamUuidList, + @Param("roleUuidList") List roleUuidList, + @Param("processUserTypeList") List processUserTypeList + ); + + List getChannelUuidListByParentUuidListAndChannelTypeUuidList( + @Param("parentUuidList") List parentUuidList, + @Param("channelTypeUuidList") List channelTypeUuidList + ); + + int getActiveChannelCountByParentUuidAndChannelTypeUuidList( + @Param("parentUuid") String parentUuid, + @Param("channelTypeUuidList") List channelTypeUuidList + ); + + Long checkChannelTypeRelationIsUsedByChannelTypeRelationId(Long channelTypeRelationId); + + Set getChannelTypeRelationReferenceUuidListByChannelTypeRelationId(Long channelTypeRelationId); + + int checkChannelTypeRelationHasReference(Long channelTypeRelationId); + + int checkChannelTypeHasReference(String channelTypeUuid); + + ChannelTypeVo getChannelTypeByName(String name); + + int insertChannelType(ChannelTypeVo channelTypeVo); + + int insertChannelTypeRelation(ChannelTypeRelationVo channelTypeRelationVo); + + int insertChannelTypeRelationSource( + @Param("channelTypeRelationId") Long channelTypeRelationId, + @Param("channelTypeUuid") String channelTypeUuid + ); + + int insertChannelTypeRelationTarget( + @Param("channelTypeRelationId") Long channelTypeRelationId, + @Param("channelTypeUuid") String channelTypeUuid + ); + + int updateChannelTypeByUuid(ChannelTypeVo channelTypeVo); + + int updateChannelTypeRelationById(ChannelTypeRelationVo channelTypeRelationVo); + + int updateChannelTypeRelationIsActiveById(Long channelTypeRelationId); + + int updateChannelTypeRelationToDeleteById(Long channelTypeRelationId); + + int deleteChannelTypeByUuid(String uuid); + + int deleteChannelTypeRelationById(Long channelTypeRelationId); + + int deleteChannelTypeRelationSourceByChannelTypeRelationId(Long id); + + int deleteChannelTypeRelationTargetByChannelTypeRelationId(Long id); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelTypeMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelTypeMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..ac056161a9e7665ead8e8fcf67865a019edc2c3e --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelTypeMapper.xml @@ -0,0 +1,480 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO `channel_type` ( + `uuid`, + `name`, + `is_active`, + `icon`, + `color`, + `description`, + `sort`, + `prefix` + ) + VALUES + ( + #{uuid}, + #{name}, + #{isActive}, + #{icon}, + #{color}, + #{description}, + #{sort}, + #{prefix} + ) + + + + INSERT INTO `channel_type_relation` ( + `id`, + `name`, + `is_active` + ) + VALUES + ( + #{id}, + #{name}, + #{isActive} + ) + + + + INSERT INTO `channel_type_relation_source` ( + `channel_type_relation_id`, + `channel_type_uuid` + ) + VALUES + ( + #{channelTypeRelationId}, + #{channelTypeUuid} + ) + + + + INSERT INTO `channel_type_relation_target` ( + `channel_type_relation_id`, + `channel_type_uuid` + ) + VALUES + ( + #{channelTypeRelationId}, + #{channelTypeUuid} + ) + + + + UPDATE `channel_type` + SET + `name` = #{name}, + `is_active` = #{isActive}, + `icon` = #{icon}, + `color` = #{color}, + `description` = #{description}, + `sort` + = #{sort}, + `prefix` = #{prefix} + WHERE `uuid` = #{uuid} + + + + UPDATE `channel_type_relation` + SET + `name` = #{name}, + `is_active` = #{isActive} + WHERE `id` = #{id} + + + + UPDATE `channel_type_relation` + SET + `is_active` = !`is_active` + WHERE `id` = #{value} + + + + UPDATE `channel_type_relation` + SET + `is_active` = 0, + `is_delete` = 1 + WHERE `id` = #{value} + + + + DELETE FROM `channel_type` WHERE `uuid` = #{uuid} + + + + DELETE FROM `channel_type_relation` WHERE `id` = #{value} + + + + DELETE FROM `channel_type_relation_source` WHERE `channel_type_relation_id` = #{value} + + + + DELETE FROM `channel_type_relation_target` WHERE `channel_type_relation_id` = #{value} + + + + \ No newline at end of file diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..219160d2bfd0db57a63f7a5b103bc6aa258b6d74 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.java @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.catalog; + +import neatlogic.framework.common.dto.ValueTextVo; +import neatlogic.framework.process.dto.PrioritySearchVo; +import neatlogic.framework.process.dto.PriorityVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface PriorityMapper { + + int searchPriorityCount(PriorityVo priorityVo); + + List searchPriorityList(PriorityVo priorityVo); + + int searchPriorityCountForMatrix(PrioritySearchVo searchVo); + + List searchPriorityListForMatrix(PrioritySearchVo searchVo); + + List searchPriorityListForSelect(PriorityVo priorityVo); + + int checkPriorityIsExists(String uuid); + + PriorityVo getPriorityByUuid(String uuid); + + List getPriorityByUuidList(List uuidList); + + PriorityVo getPriorityByName(String objValue); + + int checkPriorityNameIsRepeat(PriorityVo priorityVo); + + Integer getMaxSort(); + + int checkPriorityIsInvoked(String uuid); + + int insertPriority(PriorityVo priorityVo); + + int updatePriority(PriorityVo priorityVo); + /** + * + * @date 2020年7月8日 + * @description 从fromSort到toSort之间（fromSort和toSort）的序号加一 + * @param fromSort + * @param toSort + * @return int + */ + int updateSortIncrement(@Param("fromSort")Integer fromSort, @Param("toSort")Integer toSort); + /** + * + * @date 2020年7月8日 + * @description 从fromSort到toSort之间（fromSort和toSort）的序号减一 + * @param fromSort + * @param toSort + * @return int + */ + int updateSortDecrement(@Param("fromSort")Integer fromSort, @Param("toSort")Integer toSort); + + int deletePriorityByUuid(String uuid); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..510d746b532eaf228c4d0a3e0c2033c574d383e3 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.xml @@ -0,0 +1,283 @@ + + + + + + + + + + + + + AND `name` LIKE CONCAT('%', #{keyword}, '%') + + + AND + + + + + + `${filter.uuid}` IN + + #{item} + + + + `${filter.uuid}` = #{filter.valueList[0]} + + + + + + + (`${filter.uuid}` NOT IN + + #{item} + + OR `${filter.uuid}` IS NULL) + + + `${filter.uuid}` != #{filter.valueList[0]} + + + + + + + `${filter.uuid}` IN + + #{item} + + + + `${filter.uuid}` LIKE CONCAT('%', #{filter.valueList[0]}, '%') + + + + + + + (`${filter.uuid}` NOT IN + + #{item} + + OR `${filter.uuid}` IS NULL) + + + (`${filter.uuid}` NOT LIKE CONCAT('%', #{filter.valueList[0]}, '%') OR `${filter.uuid}` IS NULL) + + + + + (`${filter.uuid}` IS NULL OR `${filter.uuid}` = '') + + + (`${filter.uuid}` IS NOT NULL AND `${filter.uuid}` != '') + + + + + `${filter.uuid}` IN + + #{item} + + + + `${filter.uuid}` = #{filter.valueList[0]} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO `priority` (`uuid`, `name`, `is_active`, `desc`, `icon`, `color`, `sort`) + VALUES(#{uuid}, #{name}, #{isActive}, #{desc}, #{icon}, #{color}, #{sort}) + + + + UPDATE `priority` + SET + `name` = #{name}, + `is_active` = #{isActive}, + `desc` = #{desc}, + `icon` = #{icon}, + `color` = #{color}, + `sort` = #{sort} + WHERE `uuid` = #{uuid} + + + + update `priority` SET `sort` = `sort` + 1 + WHERE `sort` >= #{fromSort} + + AND `sort` <= #{toSort} + + + + + update `priority` SET `sort` = `sort` - 1 + WHERE `sort` >= #{fromSort} + + AND `sort` <= #{toSort} + + + + + DELETE FROM `priority` WHERE `uuid` = #{uuid} + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessCommentTemplateMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessCommentTemplateMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..2b457fc370e29ed0acfd1a377b3c5a40a6110991 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessCommentTemplateMapper.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.process; + +import neatlogic.framework.process.dto.ProcessCommentTemplateAuthVo; +import neatlogic.framework.process.dto.ProcessCommentTemplateSearchVo; +import neatlogic.framework.process.dto.ProcessCommentTemplateUseCountVo; +import neatlogic.framework.process.dto.ProcessCommentTemplateVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ProcessCommentTemplateMapper { + + ProcessCommentTemplateVo getTemplateById(Long id); + + ProcessCommentTemplateVo getTemplateByName(String name); + + ProcessCommentTemplateVo getTemplateByStepUuidAndAuth(@Param("stepUuid") String uuid,@Param("authList") List authList); + + ProcessCommentTemplateUseCountVo getTemplateUseCount(@Param("templateId") Long id, @Param("userUuid") String uuid); + + int checkTemplateNameIsRepeat(ProcessCommentTemplateVo vo); + + int searchCommentTemplateCount(ProcessCommentTemplateSearchVo searchVo); + + List searchCommentTemplateList(ProcessCommentTemplateSearchVo searchVo); + + List getProcessCommentTemplateAuthListByCommentTemplateId(Long id); + + int updateTemplate(ProcessCommentTemplateVo vo); + + int updateTemplateUseCount(@Param("templateId") Long id, @Param("userUuid") String uuid); + + int insertTemplate(ProcessCommentTemplateVo vo); + + int batchInsertAuthority(List list); + + int insertTemplateUseCount(@Param("templateId") Long id, @Param("userUuid") String uuid); + + int deleteTemplate(Long id); + + int deleteTemplateAuthority(Long id); + + int deleteTemplateUsecount(Long id); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessCommentTemplateMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessCommentTemplateMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..0437d6e919f6c05bf619cf977f6a82a00d024291 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessCommentTemplateMapper.xml @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + SELECT + distinct a.`id` + FROM `process_comment_template` a + JOIN `process_comment_template_authority` b ON b.`comment_template_id` = a.`id` + WHERE ((a.`type` = 'custom' AND b.`uuid` = #{userUuid}) + OR (a.`type` = 'system' + + AND b.`uuid` IN + + #{uuid} + + + )) + + AND (a.`name` LIKE concat('%', #{keyword}, '%') OR a.`content` LIKE concat('%', #{keyword}, '%')) + + + AND a.`type` = #{type} + + + + + + + + + + update + `process_comment_template` + set + `name` = #{name}, + `type` = #{type}, + `content` = #{content}, + `lcu` = #{lcu}, + `lcd` = now(3) + where `id` = #{id} + + + + update `process_comment_template_usecount` + set `count` = `count` + 1 + WHERE + `comment_template_id` = #{templateId} + and `user_uuid` = #{userUuid} + + + + insert into `process_comment_template`( + `id`, + `name`, + `content`, + `type`, + `fcu`, + `fcd`, + `lcu`, + `lcd`) + values( + #{id}, + #{name}, + #{content}, + #{type}, + #{fcu}, + now(3), + #{fcu}, + now(3) + ) + + + + INSERT INTO `process_comment_template_authority`( + `comment_template_id`, + `type`, + `uuid` + ) + VALUES + + ( + #{item.commentTemplateId}, + #{item.type}, + #{item.uuid} + ) + + + + + INSERT INTO `process_comment_template_usecount`( + `comment_template_id`, + `user_uuid`, + `count` + ) + VALUES + ( + #{templateId}, + #{userUuid}, + 0 + ) + + + + delete + from `process_comment_template` + where `id` = #{value} + + + + delete + from `process_comment_template_authority` + where `comment_template_id` = #{value} + + + + delete + from `process_comment_template_usecount` + where `comment_template_id` = #{value} + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/ProcessMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.java similarity index 84% rename from src/main/java/neatlogic/module/process/dao/mapper/ProcessMapper.java rename to src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.java index 5f60a923f6691570a2e33b0cda739d6cc7dc9b5f..2840bcf12238e9c559843950b498e404facdd48e 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/ProcessMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.java @@ -1,19 +1,21 @@ -/*Copyright (C) $today.year 深圳极向量科技有限公司 All Rights Reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.module.process.dao.mapper; +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.process; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.process.crossover.IProcessCrossoverMapper; diff --git a/src/main/java/neatlogic/module/process/dao/mapper/ProcessMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml similarity index 95% rename from src/main/java/neatlogic/module/process/dao/mapper/ProcessMapper.xml rename to src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml index d5c9d19c11d85fdd209447e7695d29a5316587b0..a83f6eaed4828ee22f761d6c4971fdeda1feab36 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/ProcessMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml @@ -1,21 +1,23 @@ - + - + + SELECT + `handler`, + `config` + FROM `process_step_handler` + + + + + + REPLACE INTO `process_step_handler` ( + `handler`, + `config` + ) VALUES ( + #{handler}, + #{configStr} + ) + + \ No newline at end of file diff --git a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessTagMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessTagMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..dba970e0fef82965aa31ba8ecd3423c27b5e91d5 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessTagMapper.java @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.process; + +import neatlogic.framework.common.dto.ValueTextVo; +import neatlogic.framework.process.dto.ProcessTagVo; + +import java.util.List; + +/** + * @author linbq + * @since 2021/10/15 14:35 + **/ +public interface ProcessTagMapper { + + List getProcessTagForSelect(ProcessTagVo processTagVo); + + List getProcessTagByNameList(List tagNameList); + + List getProcessTagByIdList(List tagIdList); + + Long getProcessTagIdByName(String Name); + + int getProcessTagCount(ProcessTagVo processTagVo); + + int insertProcessTag(ProcessTagVo processTagVo); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessTagMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessTagMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..49fb6bef07444cd59c159b6a4272c666235632da --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessTagMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + INSERT INTO `process_tag` (`id`, `name`) + VALUES (#{id}, #{name}) + + \ No newline at end of file diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskAgentMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskAgentMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..d537c197792dbff24a48c0d09de775beb6a0ff4e --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskAgentMapper.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.processtask; + +import neatlogic.framework.process.crossover.IProcessTaskAgentCrossoverMapper; +import neatlogic.framework.process.dto.agent.ProcessTaskAgentTargetVo; +import neatlogic.framework.process.dto.agent.ProcessTaskAgentVo; + +import java.util.List; + +/** + * @author linbq + * @since 2021/10/9 20:01 + **/ +public interface ProcessTaskAgentMapper extends IProcessTaskAgentCrossoverMapper { + + List getProcessTaskAgentIdListByFromUserUuid(String fromUserUuid); + + List getProcessTaskAgentListByFromUserUuid(String fromUserUuid); + + List getProcessTaskAgentListByToUserUuid(String toUserUuid); + + List getProcessTaskAgentTargetListByProcessTaskAgentId(Long processTaskAgentId); + + List getProcessTaskAgentDetailListByToUserUuid(String toUserUuid); + + List getProcessTaskAgentDetailListByFromUserUuidList(List fromUserUuidList); + + int insertProcessTaskAgent(ProcessTaskAgentVo processTaskAgentVo); + + int insertIgnoreProcessTaskAgentTarget(ProcessTaskAgentTargetVo processTaskAgentTargetVo); + + int updateProcessTaskAgentIsActiveByFromUserUuid(String fromUserUuid); + + int deleteProcessTaskAgentByFromUserUuid(String fromUserUuid); + + int deleteProcessTaskAgentTargetByProcessTaskAgentIdList(List processTaskAgentIdList); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskAgentMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskAgentMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..814172ed2d042b3bcdc0725faf8f1f60c7cb5f5c --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskAgentMapper.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO `processtask_agent` ( + `id`, + `from_user_uuid`, + `to_user_uuid`, + `begin_time`, + `end_time`, + `is_active` + ) + VALUES + ( + #{id}, + #{fromUserUuid}, + #{toUserUuid}, + #{beginTime}, + #{endTime}, + #{isActive} + ) + + + + INSERT IGNORE INTO `processtask_agent_target` ( + `processtask_agent_id`, + `target`, + `type`, + `path_list` + ) + VALUES + ( + #{processTaskAgentId}, + #{target}, + #{type}, + #{pathListStr} + ) + + + + UPDATE `processtask_agent` SET `is_active` = 1-`is_active` WHERE `from_user_uuid` = #{value} + + + + DELETE FROM `processtask_agent` WHERE `from_user_uuid` = #{value} + + + + DELETE FROM `processtask_agent_target` + WHERE `processtask_agent_id` IN + + #{processTaskAgentId} + + + \ No newline at end of file diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..61513919dba667f951373cee3453198c99228ccd --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java @@ -0,0 +1,582 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.processtask; + +import neatlogic.framework.dto.AuthenticationInfoVo; +import neatlogic.framework.file.dto.FileVo; +import neatlogic.framework.form.dto.AttributeDataVo; +import neatlogic.framework.process.crossover.IProcessTaskCrossoverMapper; +import neatlogic.framework.process.dto.*; +import neatlogic.framework.process.dto.automatic.ProcessTaskStepAutomaticRequestVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper { + + List getProcessTaskByStatusList(@Param("statusList") List statusList, @Param("count") Integer count); + + /** + * 获取工单基本信息（已删除则忽略） + * + * @param processTaskId + * @return + */ + ProcessTaskVo getProcessTaskBaseInfoById(Long processTaskId); + + /** + * 获取工单基本信息（不限是否已删除） + * + * @param processTaskId + * @return + */ + ProcessTaskVo getProcessTaskBaseInfoByIdIncludeIsDeleted(Long processTaskId); + + List getTaskListByIdList(List idList); + + /** + * 查询待处理的工单id + * + * @param map 工单查询条件 + * @return 工单ID列表 + */ + List getProcessingTaskIdListByCondition(@Param("conditionMap") Map map); + + /** + * 查询待处理的工单数量 + * + * @param map 工单查询条件 + * @return 工单数量 + */ + int getProcessingTaskCountByCondition(@Param("conditionMap") Map map); + + List getProcessTaskStepBaseInfoByProcessTaskId(Long processTaskId); + +// List getProcessTaskStepIdByConvergeId(Long convergeId); + + ProcessTaskFormVo getProcessTaskFormByProcessTaskId(Long processTaskId); + + List getProcessTaskFormExtendAttributeListByProcessTaskIdAndTag(@Param("processTaskId") Long processTaskId, @Param("tag") String tag); + + List getProcessTaskFormListByProcessTaskIdList(List existsProcessTaskIdList); + + List getProcessTaskFormAttributeDataIdListByProcessTaskId(Long processTaskId); + + List getProcessTaskFormAttributeDataListByProcessTaskId(Long processTaskId); + + List getProcessTaskExtendFormAttributeDataIdListByProcessTaskId(Long processTaskId); + + List getProcessTaskExtendFormAttributeDataListByProcessTaskId(@Param("processTaskId") Long processTaskId, @Param("tag") String tag); + + List getProcessTaskStepContentByProcessTaskStepId(Long processTaskStepId); + + List getProcessTaskStepContentByProcessTaskId(Long processTaskId); + + String getProcessTaskStartContentByProcessTaskId(Long processTaskId); + + List getProcessTaskStepUserByStepId( + @Param("processTaskStepId") Long processTaskStepId, @Param("userType") String userType); + + List getProcessTaskStepUserByStepIdList( + @Param("processTaskStepIdList") List processTaskStepIdList, @Param("userType") String userType); + + List + getProcessTaskStepWorkerPolicy(ProcessTaskStepWorkerPolicyVo processTaskStepWorkerPolicyVo); + + List getProcessTaskStepWorkerByProcessTaskIdAndProcessTaskStepId( + @Param("processTaskId") Long processTaskId, @Param("processTaskStepId") Long processTaskStepId); + + List getProcessTaskStepWorkerListByProcessTaskIdList(List processTaskIdList); + + List getProcessTaskStepWorkerListByProcessTaskStepIdListAndUserType(@Param("processTaskStepIdList") List processTaskStepIdList, @Param("userType") String userType); + + int checkProcessTaskStepWorkerIsExistsByPrimaryKey(ProcessTaskStepWorkerVo processTaskStepWorkerVo); + + Long getProcessTaskLockById(Long processTaskId); + + ProcessTaskVo getProcessTaskVoLockById(Long processTaskId); + + int checkProcessTaskConvergeIsExists(ProcessTaskConvergeVo processTaskStepConvergeVo); + + List getProcessTaskConvergeListByStepId(Long processTaskStepId); + +// List getFromProcessTaskStepByToId(Long toProcessTaskStepId); + + List getFromProcessTaskStepIdListByToId(Long toProcessTaskStepId); + + List getToProcessTaskStepByFromIdAndType( + @Param("fromProcessTaskStepId") Long fromProcessTaskStepId, @Param("type") String type); + + List getToProcessTaskStepIdListByFromIdAndType( + @Param("fromProcessTaskStepId") Long fromProcessTaskStepId, @Param("type") String type); + + List getProcessTaskStepByConvergeId(Long convergeId); + + List getProcessTaskStepRelByFromId(Long fromProcessTaskStepId); + + List getProcessTaskStepRelListByFromIdList(List fromProcessTaskStepIdList); + + List getProcessTaskStepRelByToId(Long toProcessTaskStepId); + + List getProcessTaskStepRelListByToIdList(List toStepIdList); + + List getProcessTaskStepRelByProcessTaskId(Long processTaskId); + + List getProcessTaskStepRelListByProcessTaskIdList(List processTaskIdList); + + ProcessTaskStepVo getStartProcessTaskStepByProcessTaskId(Long processTaskId); + + ProcessTaskStepVo getEndProcessTaskStepByProcessTaskId(Long processTaskId); + + List getProcessTaskStepByProcessTaskIdAndType(@Param("processTaskId") Long processTaskId, + @Param("type") String type); + + List getProcessTaskActiveStepByProcessTaskIdAndProcessStepType( + @Param("processTaskId") Long processTaskId, @Param("processStepTypeList") List processStepTypeList, + @Param("isActive") Integer isActive); + + ProcessTaskStepVo getProcessTaskStepBaseInfoById(Long processTaskStepId); + + ProcessTaskVo getProcessTaskById(Long id); + + List getProcessTaskByIdStrList(List idList); + + List getProcessTaskBySerialNumberList(List serialNumberList); + + List getProcessTaskStepAuditList(ProcessTaskStepAuditVo processTaskStepAuditVo); + + List getProcessTaskStepListByProcessTaskId(Long processTaskId); + + List getProcessTaskStepListByProcessTaskIdList(List processTaskIdList); + + Set getProcessTaskStepIdSetByChannelUuidListAndAuthenticationInfo( + @Param("keyword") String keyword, + @Param("channelUuidList") List channelUuidList, + @Param("authenticationInfoVo") AuthenticationInfoVo authenticationInfoVo + ); + + Set getProcessTaskIdSetByChannelUuidListAndAuthenticationInfo(@Param("channelUuidList") List channelUuidList, @Param("authenticationInfoVo") AuthenticationInfoVo authenticationInfoVo); + + int checkIsWorker(@Param("processTaskId") Long processTaskId, + @Param("processTaskStepId") Long processTaskStepId, @Param("userType") String userType, + @Param("authenticationInfoVo") AuthenticationInfoVo authenticationInfoVo); + + int checkIsProcessTaskStepUser(ProcessTaskStepUserVo processTaskStepUserVo); + + List getProcessTaskAssignWorker(ProcessTaskAssignWorkerVo processTaskAssignWorkerVo); + + ProcessTaskStepVo getProcessTaskStepBaseInfoByProcessTaskIdAndProcessStepUuid( + @Param("processTaskId") Long processTaskId, @Param("processStepUuid") String processStepUuid); + + List getProcessTaskAuditList(ProcessTaskStepAuditVo processTaskStepAuditVo); + + List getProcessTaskListByIdList(List processTaskIdList); + + List getProcessTaskStepListByIdList(List processTaskStepIdList); + +// ProcessTaskStepNotifyPolicyVo getProcessTaskStepNotifyPolicy(ProcessTaskStepNotifyPolicyVo processTaskStepNotifyPolicyVo); + + Map getProcessTaskOldFormAndPropByTaskId(Long processTaskId); + + List> getWorkloadByTeamUuid(String teamUuid); + + List getFileIdListByContentId(Long contentId); + + ProcessTaskStepContentVo getProcessTaskStepContentById(Long id); + + List getProcessTaskStepUserList(ProcessTaskStepUserVo processTaskStepUserVo); + + List getProcessTaskStepUserListByProcessTaskIdList(List processTaskIdList); + + List getProcessTaskStepUserListByProcessTaskIdListAndStatusList(@Param("processTaskIdList") List processTaskIdList, @Param("statusList") List statusList); + + String getProcessTaskScoreInfoById(Long processtaskId); + + ProcessTaskVo getProcessTaskAndStepById(Long processtaskId); + + Long getFromProcessTaskIdByToProcessTaskId(Long toProcessTaskId); + + List getToProcessTaskIdListByFromProcessTaskId(Long processTaskId); + + int getProcessTaskRelationCountByProcessTaskId(Long processTaskId); + + List getProcessTaskRelationList(ProcessTaskRelationVo processTaskRelationVo); + + List getRelatedProcessTaskIdListByProcessTaskId(Long processTaskId); + + List checkProcessTaskIdListIsExists(List processTaskIdList); + + int getProcessTaskCountByKeywordAndChannelUuidList(ProcessTaskSearchVo processTaskSearchVo); + + List getProcessTaskListByKeywordAndChannelUuidList(ProcessTaskSearchVo processTaskSearchVo); + + ProcessTaskTransferReportVo getProcessTaskTransferReportByToProcessTaskId(Long toProcessTaskId); + + ProcessTaskRelationVo getProcessTaskRelationById(Long id); + + List getProcessTaskStepRemindListByProcessTaskStepId(Long processTaskStepId); + + int searchProcessTaskImportAuditCount(ProcessTaskImportAuditVo processTaskImportAuditVo); + + List searchProcessTaskImportAudit(ProcessTaskImportAuditVo processTaskImportAuditVo); + + ProcessTaskScoreTemplateVo getProcessTaskScoreTemplateByProcessTaskId(Long processTaskId); + + ProcessTaskStepAgentVo getProcessTaskStepAgentByProcessTaskStepId(Long processTaskStepId); + + List getProcessTaskStepAgentListByProcessTaskIdList(List processTaskIdList); + + int checkProcessTaskFocusExists(@Param("processTaskId") Long processTaskId, + @Param("userUuid") String userUuid); + +// List getFocusUsersOfProcessTask(Long processTaskId); + + List getFocusUserListByTaskId(Long processTaskId); + + List getProcessTaskTagListByProcessTaskId(@Param("processTaskId") Long processTaskId); + + int getProcessTaskStepInOperationCountByProcessTaskId(Long processTaskId); + + List getProcessTaskStepInOperationListByProcessTaskId(Long processTaskId); + + int getProcessTaskCountByChannelTypeUuidAndStartTime(ProcessTaskVo processTaskVo); + + List getProcessTaskListByChannelTypeUuidAndStartTime(ProcessTaskVo processTaskVo); + + String getProcessTaskStepNameById(Long id); + + Integer getProcessTaskCountBySql(String searchSql); + + List> getWorkcenterProcessTaskMapBySql(String searchSql); + + List getProcessTaskBySql(String searchSql); + + List getProcessTaskCurrentStepByProcessTaskId(Long processTaskId); + + Long getProcessTaskIdByChannelUuidLimitOne(String channelUuid); + + Long getProcessTaskIdByPriorityUuidLimitOne(String prioriryUuid); + + List getChannelReferencedCountList(); + + List getProcessTaskStepFileListByTaskId(Long taskId); + + List getProcessTaskStepFileListByTaskStepId(Long taskId); + + Long getRepeatGroupIdByProcessTaskId(Long processTaskId); + + List getProcessTaskIdListByRepeatGroupId(Long repeatGroupId); + + Integer getProcessTaskStepReapprovalRestoreBackupMaxSortByBackupStepId(Long processTaskStepId); + + List getProcessTaskStepReapprovalRestoreBackupListByBackupStepId(Long processTaskStepId); + + List getProcessTaskColumnByIndexKeyword(@Param("keywordList") List keywordList, @Param("limit") int limit, @Param("targetType") String targetType, @Param("columnPro") String columnPro); + + List getProcessTaskIdAndTitleByIndexKeyword(@Param("keywordList") List keywordList, @Param("limit") int limit); + + List getProcessTaskStepIdListByProcessTaskIdAndTagId(ProcessTaskStepTagVo processTaskStepTagVo); + + int checkProcessTaskStepTagIsExists(ProcessTaskStepTagVo processTaskStepTagVo); + + List getSameTagIdListByProcessTaskStepIdList(List processTaskStepIdList); + + List getTagIdListByProcessTaskStepId(Long processTaskStepId); + + int getProcessTaskCountByOwner(ProcessTaskVo vo); + + List getProcessTaskListByOwner(ProcessTaskVo vo); + + ProcessTaskStepAutomaticRequestVo getProcessTaskStepAutomaticRequestById(Long id); + + List getAllProcessTaskStepAutomaticRequestList(); + + List getProcessTaskStepVoListByFileId(Long fileId); + + ProcessTaskStepTimerVo getProcessTaskStepTimerByProcessTaskStepId(Long processTaskStepId); + + List getAllProcessTaskStepTimerList(); + + List getProcessTaskStepListByProcessTaskIdAndProcessStepUuidList(@Param("processTaskId") Long processTaskId, @Param("processStepUuidList") List processStepUuidList); + + Integer getAllProcessTaskCount(); + + List getProcessTaskIdList(ProcessTaskVo processTaskVo); + + List getProcessTaskStepByProcessTaskIdAndStepName(ProcessTaskStepVo vo); + + List> getProcessTaskListWhichIsProcessingByUserAndTag(@Param("tag") String tag, @Param("userUuid") String userUuid, @Param("teamUuidList") List teamUuidList, @Param("roleUuidList") List roleUuidList); + + /** + * 根据给定的工单ID，查询其中当前步骤超过一个的工单id列表 + * + * @param processTaskIdList 工单ID列表 + * @return + */ + List getProcessTaskIdListWhichCurrentProcessTaskStepCountIsOverOneByProcessTaskIdList(@Param("list") List processTaskIdList); + + List getCurrentProcessTaskStepListByProcessTaskIdListAndTag(@Param("list") List processTaskIdList, @Param("tag") String tag); + + List getProcessTaskFormContentListByContentLikeKeyword(String formstaticlist); + + List getProcessTaskFormContentList(); + + List getFileListByProcessTaskId(Long processTaskId); + + List getFileDetailListByProcessTaskId(Long processTaskId); + + /** + * 根据工单ID查询所有子任务附件 + * + * @param processTaskId 工单ID + * @return + */ + List getProcessTaskStepTaskFileListByProcessTaskId(Long processTaskId); + + String getProcessTaskLastUrgeUserUuidByProcessTaskId(Long processTaskId); + + int getProcessTaskUrgeCountByProcessTaskId(Long processTaskId); + + int searchProcessTaskCountByOwnerAndExcludeId(ProcessTaskSearchVo searchVo); + + List searchProcessTaskListByOwnerAndExcludeId(ProcessTaskSearchVo searchVo); + + int getSubProcessTaskCountByStepId(Long processTaskStepId); + + List SearchSubProcessTaskListByStepId(Long processTaskStepId); + + ProcessTaskInvokeVo getInvokeByProcessTaskId(Long processTaskId); + + int getSubProcessTaskCountByStepIdAndWithoutEndStatusList(@Param("processTaskStepId") Long processTaskStepId,@Param("statusList") List statusList); + + int insertIgnoreProcessTaskConfig(ProcessTaskConfigVo processTaskConfigVo); + + int replaceProcessTaskOldFormProp(@Param("processTaskId") Long processTaskId, @Param("form") String form, + @Param("prop") String prop); + + int insertProcessTaskForm(ProcessTaskFormVo processTaskFormVo); + + int insertIgnoreProcessTaskFormContent(ProcessTaskFormVo processTaskFormVo); + + int insertProcessTask(ProcessTaskVo processTaskVo); + + int replaceProcessTask(ProcessTaskVo processTaskVo); + + int insertIgnoreProcessTaskContent(ProcessTaskContentVo processTaskContentVo); + + int batchInsertIgnoreProcessTaskContent(List list); + + int insertProcessTaskStep(ProcessTaskStepVo processTaskStepVo); + + int replaceProcessTaskStep(ProcessTaskStepVo processTaskStepVo); + + int insertProcessTaskStepUser(ProcessTaskStepUserVo processTaskStepUserVo); + + int insertProcessTaskStepMinorUser(ProcessTaskStepUserVo processTaskStepUserVo); + + int insertProcessTaskStepWorkerPolicy(ProcessTaskStepWorkerPolicyVo processTaskStepWorkerPolicyVo); + + int insertProcessTaskStepRel(ProcessTaskStepRelVo processTaskStepRelVo); + + int insertProcessTaskStepContent(ProcessTaskStepContentVo processTaskStepContentVo); + + int insertProcessTaskOperationContent(ProcessTaskOperationContentVo processTaskOperationContentVo); + + int insertProcessTaskStepAudit(ProcessTaskStepAuditVo processTaskStepAuditVo); + + int batchInsertProcessTaskStepAudit(List list); + + int insertProcessTaskStepAuditDetail(ProcessTaskStepAuditDetailVo processTaskStepAuditDetailVo); + + int batchInsertProcessTaskStepAuditDetail(List list); + + int insertIgnoreProcessTaskStepWorker(ProcessTaskStepWorkerVo processTaskStepWorkerVo); + + int insertIgnoreProcessTaskStepUser(ProcessTaskStepUserVo processTaskStepUserVo); + + int insertIgnoreProcessTaskConverge(ProcessTaskConvergeVo processTaskConvergeVo); + + int insertIgnoreProcessTaskStepConfig(ProcessTaskStepConfigVo processTaskStepConfigVo); + +// int insertProcessTaskStepFormAttribute( +// ProcessTaskStepFormAttributeVo processTaskStepFormAttributeVo); + + int insertProcessTaskFormAttribute(ProcessTaskFormAttributeDataVo processTaskFromAttributeDataVo); + + int insertProcessTaskExtendFormAttribute(ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo); + + int insertProcessTaskStepFile(ProcessTaskStepFileVo processTaskStepFileVo); + + int insertProcessTaskAssignWorker(ProcessTaskAssignWorkerVo processTaskAssignWorkerVo); + +// int insertIgnoreProcessTaskStepNotifyPolicyConfig(ProcessTaskStepNotifyPolicyVo processTaskStepNotifyPolicyVo); + + int insertProcessTaskStepNotifyPolicy(ProcessTaskStepNotifyPolicyVo processTaskStepNotifyPolicyVo); + + int insertProcessTaskTransferReport(ProcessTaskTransferReportVo processTaskTransferReportVo); + + int replaceProcessTaskRelation(ProcessTaskRelationVo processTaskRelationVo); + + int insertProcessTaskStepRemind(ProcessTaskStepRemindVo processTaskStepRemindVo); + + int batchInsertProcessTaskImportAudit(@Param("list") List processTaskImportAuditVos); + + int insertProcessTaskScoreTemplate(ProcessTaskScoreTemplateVo processTaskScoreTemplateVo); + + int insertProcessTaskScoreTemplateConfig(ProcessTaskScoreTemplateConfigVo processTaskScoreTemplateConfigVo); + + int insertProcessTaskFocus(@Param("processTaskId") Long processTaskId, + @Param("userUuid") String userUuid); + + int insertProcessTaskTag(@Param("processTaskTagList") List processTaskTagList); + + int replaceProcessTaskStepAgent(ProcessTaskStepAgentVo processTaskStepAgentVo); + + int insertProcessTaskStepInOperation(ProcessTaskStepInOperationVo processTaskStepInOperationVo); + + int insertProcessTaskStepTag(ProcessTaskStepTagVo processTaskStepTagVo); + + int replaceProcessTaskRepeatList(List processTaskRepeatList); + + int replaceProcessTaskRepeat(ProcessTaskRepeatVo processTaskRepeatVo); + + int insertProcessTaskStepReapprovalRestoreBackup(ProcessTaskStepReapprovalRestoreBackupVo processTaskStepReapprovalRestoreBackupVo); + + int insertProcessTaskStepAutomaticRequest(ProcessTaskStepAutomaticRequestVo processTaskStepAutomaticRequestVo); + + int insertProcessTaskStepTimer(ProcessTaskStepTimerVo processTaskStepTimerVo); + + void insertProcessTaskTimeCost(ProcessTaskTimeCostVo processTaskTimeCostVo); + + void insertProcessTaskUrge(@Param("processTaskId") Long processTaskId, @Param("lcu") String lcu); + + int insertProcessTaskInvoke(@Param("processTaskId") Long processTaskId, @Param("source") String invoke, @Param("sourceType") String invokeType, @Param("invokeId") Long invokeId); + + int insertProcessTaskFormExtendAttribute(ProcessTaskFormAttributeVo processTaskFormAttributeVo); + + int updateProcessTaskStepStatus(ProcessTaskStepVo processTaskStepVo); + + int updateProcessTaskStatus(ProcessTaskVo processTaskVo); + + // int updateProcessTaskStepRelIsHit(@Param("fromProcessTaskStepId") Long fromProcessTaskStepId, @Param("toProcessTaskStepId") Long toProcessTaskStepId, @Param("isHit") Integer isHit); + int updateProcessTaskStepRelIsHit(ProcessTaskStepRelVo processTaskStepRelVo); + +// int updateProcessTaskStepConvergeIsCheck(@Param("isCheck") Integer isCheck, +// @Param("convergeId") Long convergeId, @Param("processTaskStepId") Long processTaskStepId); + + int updateProcessTaskStepUserStatus(ProcessTaskStepUserVo processTaskStepUserVo); + + int updateProcessTaskIsShow(ProcessTaskVo processTaskVo); + + int updateProcessTaskNeedScoreByIdList(@Param("idList") List idList, @Param("needScore") Integer needScore); + + int updateProcessTaskTitleOwnerPriorityUuid(ProcessTaskVo processTaskVo); + + int updateProcessTaskStepContentById(ProcessTaskStepContentVo processTaskStepContentVo); + + int updateProcessTaskStepWorkerUuid(ProcessTaskStepWorkerVo processTaskStepWorkerVo); + + int updateProcessTaskStepUserUserUuid(ProcessTaskStepUserVo processTaskStepUserVo); + + int updateProcessTaskPriorityUuidById(@Param("id") Long processTaskId, + @Param("priorityUuid") String priorityUuid); + + int updateProcessTaskSerialNumberById(@Param("id") Long processTaskId, + @Param("serialNumber") String serialNumber); + + int updateProcessTaskStepAutomaticRequestTriggerTimeById(ProcessTaskStepAutomaticRequestVo processTaskStepAutomaticRequestVo); + + int updateProcessTaskStepTimerTriggerTimeById(ProcessTaskStepTimerVo processTaskStepTimerVo); + + int updateProcessTaskStepStatusByStepId(ProcessTaskStepVo processTaskStepVo); + + int updateProcessTaskStepMajorUserAndStatus(ProcessTaskStepUserVo processTaskStepUserVo); + + int updateProcessTaskFormFormContentHashByFormContentHash(@Param("oldFormConfigHash") String oldFormConfigHash, @Param("newFormConfigHash") String newFormConfigHash); + + int updateProcessTaskIsDeletedById(@Param("id") Long id, @Param("isDeleted") Integer isDeleted); + + int deleteProcessTaskFormAttributeByProcessTaskId(Long processTaskId); + + int deleteProcessTaskExtendFormAttributeByProcessTaskId(Long processTaskId); + + int deleteProcessTaskStepWorker(ProcessTaskStepWorkerVo processTaskStepWorkerVo); + + int deleteProcessTaskStepUser(ProcessTaskStepUserVo processTaskStepUserVo); + + int deleteProcessTaskConvergeByStepId(Long processTaskStepId); + + int deleteProcessTaskAssignWorker(ProcessTaskAssignWorkerVo processTaskAssignWorkerVo); + + int deleteProcessTaskStepFileByProcessTaskStepId(@Param("processTaskId") Long processTaskId, @Param("processTaskStepId") Long processTaskStepId); + + int deleteProcessTaskStepContentByProcessTaskStepId(Long processTaskStepId); + + int deleteProcessTaskStepFileByContentId(Long contentId); + + int deleteProcessTaskStepContentById(Long contentId); + + int deleteProcessTaskRelationById(Long processTaskRelationId); + + int deleteProcessTaskStepRemind(ProcessTaskStepRemindVo processTaskStepRemindVo); + + int deleteProcessTaskFocus(@Param("processTaskId") Long processTaskId, + @Param("userUuid") String userUuid); + + int deleteProcessTaskStepAgentByProcessTaskStepId(Long processTaskStepId); + + int deleteProcessTaskAssignWorkerByProcessTaskId(Long processTaskId); + + int deleteProcessTaskConvergeByProcessTaskId(Long processTaskId); + + int deleteProcessTaskStepFileByProcessTaskId(Long processTaskId); + + int deleteProcessTaskFormByProcessTaskId(Long processTaskId); + + int deleteProcessTaskStepByProcessTaskId(Long processTaskId); + + int deleteProcessTaskByProcessTaskId(Long processTaskId); + + int deleteProcessTaskFocusByProcessTaskId(Long processTaskId); + + int deleteProcessTaskTagByProcessTaskId(Long processTaskId); + + int deleteProcessTaskStepInOperationById(Long id); + + int deleteProcessTaskStepInOperationByProcessTaskId(Long processTaskId); + + int deleteProcessTaskStepWorkerMinorByProcessTaskStepId(Long processTaskStepId); + + int deleteProcessTaskStepUserMinorByProcessTaskStepId(Long processTaskStepId); + + int deleteProcessTaskRepeatByProcessTaskId(Long processTaskId); + + int deleteProcessTaskStepReapprovalRestoreBackupByBackupStepId(Long processTaskStepId); + + int deleteProcessTaskStepAutomaticRequestById(Long id); + + int deleteProcessTaskStepAutomaticRequestByProcessTaskStepId(Long id); + + int deleteProcessTaskStepTimerByProcessTaskStepId(Long processTaskStepId); + + int deleteProcessTaskTimeCostByProcessTaskId(Long processTaskId); + + int deleteProcessTaskFormContentByHash(String hash); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..50edf21b07bce5ede0db85a64c64055643251d13 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml @@ -0,0 +1,4094 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT `id`, + `serial_number`, + `title`, + `process_uuid`, + `channel_uuid`, + `config_hash`, + `priority_uuid`, + `status`, + `start_time`, + `end_time`, + `owner`, + `reporter`, + `expire_time`, + `worktime_uuid`, + `is_show`, + `serial_number`, + `need_score`, + `source`, + `is_deleted` + FROM `processtask` + + + + + + + + FROM + processtask pt + LEFT JOIN processtask_step pts ON pt.id = pts.processtask_id + LEFT JOIN processtask_step_user ptsu ON pts.processtask_id = ptsu.processtask_id + AND pts.id = ptsu.processtask_step_id + LEFT JOIN processtask_step_worker ptsw ON pts.processtask_id = ptsw.processtask_id + AND pts.id = ptsw.processtask_step_id + where + pt.`status` in ('running') + and + pts.`status` in ('pending','running' ) + and ( + ptsu.`user_uuid` in (#{conditionMap.userUuid}) + + or + ptsw.`uuid` in + + #{item} + + and + ptsw.`type` in ('team') + + + or + ptsw.`uuid` in + + #{item} + + and + ptsw.`type` in ('role') + + or ptsw.`uuid` in (#{conditionMap.userUuid}) + and ptsw.`type` in ('user') + ) + and ( pts.type != 'start' + and ( ptsu.`user_uuid` in + + #{item} + + or + ptsw.`uuid` in + + #{item} + + ) + ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WHERE `owner` = #{owner} + + AND `status` = #{status} + + + AND EXISTS ( + SELECT 1 FROM `channel` c WHERE c.`uuid` = pt.`channel_uuid` AND c.`name` = #{channelName} + ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE + `processtask_step_rel` + SET + `is_hit` = #{isHit} + WHERE `from_processtask_step_id` = #{fromProcessTaskStepId} + + AND `to_processtask_step_id` = #{toProcessTaskStepId} + + + AND `type` = #{type} + + + + + UPDATE + `processtask_step` + SET + `status` = #{status}, + `result` = #{result}, + `is_active` = #{isActive}, + + `active_time` = NOW(3), + + + + `start_time` = NOW(3), + + + `start_time` = NULL, + + + + + `end_time` = NOW(3), + + + `end_time` = NULL, + + + `error` = #{error} + WHERE `id` = #{id} + + + + INSERT INTO `processtask_step_audit_detail` (`audit_id`, + `type`, + `old_content`, + `new_content`) + VALUES (#{auditId}, + #{type}, + #{oldContent}, + #{newContent}) + + + + INSERT INTO `processtask_step_audit_detail` + ( + `audit_id`, + `type`, + `old_content`, + `new_content` + ) + VALUES + + ( + #{item.auditId}, + #{item.type}, + #{item.oldContent}, + #{item.newContent} + ) + + + + + + + + INSERT INTO `processtask_step_audit` ( + `id`, + `processtask_id`, + `processtask_step_id`, + `user_uuid`, + `action_time`, + `action`, + `step_status`, + `original_user`, + `description_hash`, + `source` + ) + VALUES + ( + #{id}, + #{processTaskId}, + #{processTaskStepId}, + #{userUuid}, + NOW(3), + #{action}, + #{stepStatus}, + #{originalUser}, + #{descriptionHash}, + #{source} + ) + + + + INSERT INTO `processtask_step_audit` ( + `id`, + `processtask_id`, + `processtask_step_id`, + `user_uuid`, + `action_time`, + `action`, + `step_status`, + `original_user`, + `description_hash`, + `source` + ) + VALUES + + ( + #{item.id}, + #{item.processTaskId}, + #{item.processTaskStepId}, + #{item.userUuid}, + #{item.actionTime}, + #{item.action}, + #{item.stepStatus}, + #{item.originalUser}, + #{item.descriptionHash}, + #{item.source} + ) + + + + + INSERT INTO `processtask_form` (`processtask_id`, + `form_uuid`, + `form_name`, + `form_content_hash`) + VALUES (#{processTaskId}, + #{formUuid}, + #{formName}, + #{formContentHash}) + + + + INSERT IGNORE INTO `processtask_form_content` (`hash`, `content`) + VALUES (#{formContentHash}, #{formContent}); + + + + INSERT INTO `processtask_step_worker_policy` (`processtask_id`, + `processtask_step_id`, + `process_step_uuid`, + `policy`, + `sort`, + `config`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{processStepUuid}, + #{policy}, + #{sort}, + #{config}) + + + + INSERT ignore INTO `processtask_formattribute` (`processtask_id`, `form_attribute_data_id`) + VALUES (#{processTaskId}, #{id}) + + + + INSERT ignore INTO `processtask_extend_formattribute` (`processtask_id`, `form_attribute_data_id`, `tag`) + VALUES (#{processTaskId}, #{id}, #{tag}) + + + + INSERT IGNORE INTO `processtask_converge` (`converge_id`, + `processtask_step_id`, + `processtask_id`) + VALUES (#{convergeId}, + #{processTaskStepId}, + #{processTaskId}) + + + + INSERT ignore INTO `processtask_step_worker` (`processtask_id`, + `processtask_step_id`, + `type`, + `uuid`, + `user_type`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{type}, + #{uuid}, + #{userType}) + + + + INSERT INTO `processtask_step_rel` (`processtask_id`, + `from_process_step_uuid`, + `to_process_step_uuid`, + `from_processtask_step_id`, + `to_processtask_step_id`, + `condition`, + `is_hit`, + `uuid`, + `name`, + `type`) + VALUES (#{processTaskId}, + #{fromProcessStepUuid}, + #{toProcessStepUuid}, + #{fromProcessTaskStepId}, + #{toProcessTaskStepId}, + #{condition}, + #{isHit}, + #{processStepRelUuid}, + #{name}, + #{type}) + + + + + INSERT INTO `processtask_step` ( + `id`, + `processtask_id`, + `name`, + `process_step_uuid`, + `status`, + `type`, + `handler`, + `is_active`, + `config_hash` + ) + VALUES + ( + #{id}, + #{processTaskId}, + #{name}, + #{processStepUuid}, + #{status}, + #{type}, + #{handler}, + #{isActive}, + #{configHash} + ) + + + + + REPLACE INTO `processtask_step` ( + `id`, + `processtask_id`, + `name`, + `process_step_uuid`, + `status`, + `type`, + `handler`, + `is_active`, + `active_time`, + `start_time`, + `end_time`, + `config_hash` + ) + VALUES + ( + #{id}, + #{processTaskId}, + #{name}, + #{processStepUuid}, + #{status}, + #{type}, + #{handler}, + #{isActive}, + #{activeTime}, + #{startTime}, + #{endTime}, + #{configHash} + ) + + + + + INSERT INTO `processtask` ( + `id`, + `title`, + `process_uuid`, + `channel_uuid`, + `config_hash`, + `priority_uuid`, + `status`, + `start_time`, + `owner`, + `reporter`, + `expire_time`, + `worktime_uuid`, + `serial_number`, + `need_score`, + `source`, + `region_id` + ) + VALUES + ( + #{id}, + #{title}, + #{processUuid}, + #{channelUuid}, + #{configHash}, + #{priorityUuid}, + #{status}, + NOW(3), + #{owner}, + #{reporter}, + #{expireTime}, + #{worktimeUuid}, + #{serialNumber}, + #{needScore}, + #{source}, + #{regionId} + ) + + + + + REPLACE INTO `processtask` ( + `id`, + `title`, + `process_uuid`, + `channel_uuid`, + `config_hash`, + `priority_uuid`, + `status`, + `start_time`, + `owner`, + `reporter`, + `expire_time`, + `serial_number`, + `worktime_uuid`, + `region_id` + ) + VALUES + ( + #{id}, + #{title}, + #{processUuid}, + #{channelUuid}, + #{configHash}, + #{priorityUuid}, + #{status}, + NOW(3), + #{owner}, + #{reporter}, + #{expireTime}, + #{serialNumber}, + #{worktimeUuid}, + #{regionId} + ) + + + + INSERT IGNORE INTO `processtask_content` (`content`, `hash`) + VALUES (#{content}, #{hash}) + + + + INSERT IGNORE INTO `processtask_content` (`content`, `hash`) + VALUES + + ( + #{item.content}, + #{item.hash} + ) + + + + + INSERT INTO `processtask_step_content` (`id`, + `processtask_id`, + `processtask_step_id`, + `content_hash`, + `type`, + `source`, + `fcd`, + `fcu`, + `lcd`, + `lcu`) + VALUES (#{id}, + #{processTaskId}, + #{processTaskStepId}, + #{contentHash}, + #{type}, + #{source}, + NOW(3), + #{fcu}, + NOW(3), + #{fcu}) + + + + INSERT INTO `processtask_operation_content` (`id`, + `processtask_id`, + `content_hash`, + `type`, + `source`, + `fcd`, + `fcu`, + `lcd`, + `lcu`) + VALUES (#{id}, + #{processTaskId}, + #{contentHash}, + #{type}, + #{source}, + NOW(3), + #{fcu}, + NOW(3), + #{fcu}) + + + + INSERT INTO `processtask_step_user` (`processtask_id`, + `processtask_step_id`, + `user_uuid`, + `user_type`, + `user_name`, + `status`, + `active_time`, + `start_time`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{userUuid}, + #{userType}, + #{userName}, + #{status}, + NOW(3), + NOW(3)) + + + + INSERT IGNORE INTO `processtask_step_user` (`processtask_id`, + `processtask_step_id`, + `user_uuid`, + `user_type`, + `user_name`, + `status`, + `active_time`, + `end_time`, + `start_time`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{userUuid}, + #{userType}, + #{userName}, + #{status}, + #{activeTime}, + #{endTime}, + #{startTime}) + + + + INSERT INTO `processtask_step_user` (`processtask_id`, + `processtask_step_id`, + `user_uuid`, + `user_type`, + `user_name`, + `status`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{userUuid}, + 'minor', + #{userName}, + #{status}) + ON DUPLICATE KEY UPDATE + `status` = #{status} + + + + insert ignore INTO `processtask_step_config` (`hash`, `config`) + VALUES (#{hash}, #{config}) + + + + + + INSERT IGNORE INTO `processtask_config` (`hash`, `config`) + VALUES (#{hash}, #{config}) + + + + INSERT INTO `processtask_file` (`processtask_id`, + `processtask_step_id`, + `content_id`, + `file_id`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{contentId}, + #{fileId}) + + + + INSERT INTO `processtask_assignworker` (`processtask_id`, + `processtask_step_id`, + `from_processtask_step_id`, + `from_process_step_uuid`, + `type`, + `uuid`, + `fcu`, + `fcd`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{fromProcessTaskStepId}, + #{fromProcessStepUuid}, + #{type}, + #{uuid}, + #{fcu}, + NOW(3)) + + + + + + INSERT INTO `processtask_step_notify_policy` (`processtask_step_id`, + `policy_id`, + `policy_name`, + `policy_handler`, + `policy_config_hash`) + VALUES (#{processTaskStepId}, + #{policyId}, + #{policyName}, + #{policyHandler}, + #{policyConfigHash}) + + + + REPLACE INTO `processtask_old_form_prop` (`processtask_id`, `form`, `prop`) + VALUES (#{processTaskId}, #{form}, #{prop}) + + + + INSERT INTO `processtask_tranfer_report` (`id`, + `channel_type_relation_id`, + `from_processtask_id`, + `to_processtask_id`) + VALUES (#{id}, + #{channelTypeRelationId}, + #{fromProcessTaskId}, + #{toProcessTaskId}) + + + + REPLACE INTO `processtask_relation` (`id`, + `channel_type_relation_id`, + `source`, + `target`) + VALUES (#{id}, + #{channelTypeRelationId}, + #{source}, + #{target}) + + + + INSERT INTO `processtask_import_audit`( + `id`, + `processtask_id`, + `title`, + `channel_uuid`, + `status`, + `error_reason`, + `owner`, + `import_time` + ) + VALUES + + ( + #{item.id}, + #{item.processTaskId}, + #{item.title}, + #{item.channelUuid}, + #{item.status}, + #{item.errorReason}, + #{item.owner}, + NOW(3) + ) + + + + + INSERT INTO `processtask_step_remind` (`processtask_id`, + `processtask_step_id`, + `action`, + `title`, + `fcu`, + `fcd`, + `content_hash`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{action}, + #{title}, + #{fcu}, + NOW(3), + #{contentHash}) + + + + INSERT INTO `processtask_score_template` (`processtask_id`, + `score_template_id`, + `is_auto`, + `config_hash`) + VALUES (#{processTaskId}, + #{scoreTemplateId}, + #{isAuto}, + #{configHash}) + + + + INSERT INTO `processtask_score_template_config` (`hash`, `config`) + VALUES (#{hash}, #{config}) + + + + INSERT IGNORE INTO `processtask_focus` (`processtask_id`, `user_uuid`) + VALUES (#{processTaskId}, #{userUuid}) + + + + REPLACE INTO `processtask_step_agent` (`processtask_id`, + `processtask_step_id`, + `user_uuid`, + `agent_uuid`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{userUuid}, + #{agentUuid}) + + + + INSERT INTO `processtask_tag` (`processtask_id`, `tag_id`) + VALUES + + #{tag.processTaskId}, + #{tag.tagId} + + + + + + select LAST_INSERT_ID() as id + + INSERT IGNORE INTO `processtask_step_in_operation` (`processtask_id`, + `processtask_step_id`, + `operation_type`, + `operation_time`, + `expire_time`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{operationType}, + NOW(3), + #{expireTime}) + + + + INSERT INTO `processtask_step_tag` (`processtask_id`, + `processtask_step_id`, + `tag_id`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{tagId}) + + + + REPLACE INTO `processtask_repeat` (`processtask_id`, `repeat_group_id`) VALUES + + (#{processTaskRepeat.processTaskId}, #{processTaskRepeat.repeatGroupId}) + + + + + REPLACE INTO `processtask_repeat` (`processtask_id`, `repeat_group_id`) + VALUES (#{processTaskId}, #{repeatGroupId}) + + + + INSERT INTO `processtask_step_reapproval_restore_backup` (`processtask_id`, + `processtask_step_id`, + `backup_step_id`, + `config`, + `sort`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{backupStepId}, + #{configStr}, + #{sort}) + + + + + select LAST_INSERT_ID() as id + + INSERT INTO `processtask_step_automatic_request` ( + `processtask_id`, + `processtask_step_id`, + `type` + ) + VALUES + ( + #{processTaskId}, + #{processTaskStepId}, + #{type} + ) + + + + INSERT INTO `processtask_step_timer` (`processtask_id`, + `processtask_step_id`, + `trigger_time`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{triggerTime}) + + + + INSERT INTO `processtask_time_cost` (`processtask_id`, + `time_cost`, + `realtime_cost`) + VALUES (#{processTaskId}, + #{timeCost}, + #{realTimeCost}) + ON DUPLICATE KEY UPDATE + `time_cost` = #{timeCost}, + `realtime_cost` = #{realTimeCost} + + + + INSERT INTO `processtask_urge` (`processtask_id`, `lcu`, `lcd`) + VALUES (#{processTaskId}, #{lcu}, NOW(3)) + + + INSERT INTO `processtask_invoke` (`processtask_id`, `source`, `type`, `invoke_id`) + VALUES (#{processTaskId}, #{source}, #{sourceType}, #{invokeId}); + + + + INSERT INTO `processtask_form_extend_attribute` ( + `processtask_id`, + `form_uuid`, + `parent_uuid`, + `tag`, + `key`, + `uuid`, + `label`, + `type`, + `handler`, + `config_hash` + ) + VALUES + ( + #{processTaskId}, + #{formUuid}, + #{parentUuid}, + #{tag}, + #{key}, + #{uuid}, + #{label}, + #{type}, + #{handler}, + #{configHash} + ) + + + + UPDATE + `processtask_step_user` + SET + + + `start_time` = NOW(3), + `end_time` = NULL, + + + `end_time` = NOW(3), + + + `status` = #{status} + WHERE + `processtask_step_id` = #{processTaskStepId} + + AND `user_uuid` = #{userUuid} + + AND `user_type` = #{userType} + + + + UPDATE + `processtask` + SET + + + `end_time` = NOW(3), + + + + `end_time` = null, + + + `status` = #{status} + WHERE + `id` = #{id} + + + + UPDATE + `processtask` + SET `title` = #{title}, + `priority_uuid` = #{priorityUuid}, + `owner` = #{owner}, + `reporter` = #{reporter} + WHERE `id` = #{id} + + + + UPDATE `processtask_step_content` + SET `content_hash` = #{contentHash}, + `source` = #{source}, + `lcd` = NOW(3), + `lcu` = #{lcu} + WHERE `id` = #{id} + + + + UPDATE `processtask_step_worker` + SET `uuid` = #{newUuid} + WHERE `processtask_step_id` = #{processTaskStepId} + AND `type` = #{type} + AND `uuid` = #{uuid} + AND `user_type` = #{userType} + + + + UPDATE `processtask_step_user` + SET `user_uuid` = #{newUserUuid}, `user_name` = #{userName} + WHERE `processtask_step_id` = #{processTaskStepId} + AND `user_uuid` = #{userUuid} + AND `user_type` = #{userType} + + + + UPDATE `processtask` + SET `is_show` = #{isShow} + WHERE id = #{id} + + + + UPDATE `processtask` + SET `need_score` = #{needScore} + WHERE `id` IN + + #{id} + + + + + UPDATE `processtask` + SET `priority_uuid` = #{priorityUuid} + WHERE `id` = #{id} + + + + UPDATE `processtask` + SET `serial_number` = #{serialNumber} + WHERE `id` = #{id} + + + + UPDATE `processtask_step_automatic_request` + SET `trigger_time` = #{triggerTime} + WHERE `id` = #{id} + + + + UPDATE `processtask_step_timer` + SET `trigger_time` = #{triggerTime} + where `processtask_step_id` = #{processTaskStepId} + + + + UPDATE + `processtask_step` + SET `status` = #{status}, + `is_active` = #{isActive} + WHERE `id` = #{id} + + + + UPDATE `processtask_step_user` + SET `user_uuid` = #{userUuid}, + `user_name` = #{userName}, + + + `start_time` = NOW(3), + `end_time` = NULL, + + + `end_time` = NOW(3), + + + `status` = #{status} + WHERE `processtask_step_id` = #{processTaskStepId} + AND `user_type` = 'major' + + + + UPDATE `processtask_form` + SET `form_content_hash` = #{newFormConfigHash} + WHERE `form_content_hash` = #{oldFormConfigHash} + + + + UPDATE + `processtask` + SET `is_deleted` = #{isDeleted} + WHERE `id` = #{id} + + + + DELETE + FROM `processtask_converge` + WHERE `processtask_step_id` = #{value} + + + + DELETE + FROM `processtask_converge` + WHERE `processtask_id` = #{value} + + + + DELETE + FROM `processtask_formattribute` + WHERE `processtask_id` = #{value} + + + + DELETE + FROM `processtask_Extend_formattribute` + WHERE `processtask_id` = #{value} + + + + DELETE FROM `processtask_step_worker` + + + `processtask_id` = #{processTaskId} + + + AND `processtask_step_id` = #{processTaskStepId} + + + AND `type` = #{type} + + + AND `uuid` = #{uuid} + + + AND `user_type` = #{userType} + + + + + + DELETE + FROM + `processtask_step_user` + WHERE `processtask_step_id` = #{processTaskStepId} + + AND `user_type` = #{userType} + + + AND `user_uuid` = #{userUuid} + + + + + DELETE + FROM `processtask_assignworker` + WHERE `processtask_id` = #{processTaskId} + AND `processtask_step_id` = #{processTaskStepId} + AND `from_processtask_step_id` = #{fromProcessTaskStepId} + + + + DELETE + FROM `processtask_assignworker` + WHERE `processtask_id` = #{value} + + + + DELETE + FROM `processtask_file` + WHERE `processtask_id` = #{processTaskId} + and `processtask_step_id` = #{processTaskStepId} + + + + DELETE + FROM `processtask_file` + WHERE `processtask_id` = #{value} + + + + DELETE + FROM `processtask_step_content` + WHERE `processtask_step_id` = #{value} + + + + DELETE + FROM `processtask_file` + WHERE `content_id` = #{value} + + + + DELETE + FROM `processtask_step_content` + WHERE `id` = #{value} + + + + DELETE + FROM `processtask_relation` + WHERE `id` = #{value} + + + + DELETE FROM `processtask_step_remind` + WHERE `processtask_step_id` = #{processTaskStepId} + + AND `action` = #{action} + + + + + DELETE FROM `processtask_focus` WHERE `processtask_id` = #{processTaskId} + + and `user_uuid` = #{userUuid} + + + + + DELETE + FROM `processtask_focus` + WHERE `processtask_id` = #{value} + + + + delete + from `processtask_form` + where `processtask_id` = #{value} + + + + DELETE ps,psa,psau,psaud,psc,psnp,psd,psf,psr,psrl,pss,pst,psu,psw,pswp + FROM `processtask_step` ps + LEFT JOIN + `processtask_step_agent` psa + ON psa.`processtask_id` = ps.`processtask_id` AND psa.`processtask_step_id` = ps.id + LEFT JOIN `processtask_step_audit` psau ON psau.`processtask_id` = ps.`processtask_id` + AND psau.`processtask_step_id` = ps.id + LEFT JOIN `processtask_step_audit_detail` psaud ON psau.id = psaud.audit_id + LEFT JOIN `processtask_step_content` psc ON psc.`processtask_id` = + ps.`processtask_id` AND psc.`processtask_step_id` = ps.id + LEFT JOIN `processtask_step_notify_policy` psnp ON psnp.`processtask_step_id` = ps.id + LEFT JOIN `processtask_step_data` psd + ON psd.`processtask_id` = ps.`processtask_id` AND psd.`processtask_step_id` = + ps.id + LEFT JOIN `processtask_step_remind` psr ON psr.`processtask_id` + = ps.`processtask_id` AND + psr.`processtask_step_id` = ps.id + LEFT JOIN `processtask_step_rel` psrl ON psrl.`processtask_id` = ps.`processtask_id` + LEFT JOIN `processtask_step_sla` pss ON + pss.`processtask_step_id` = ps.id + LEFT JOIN `processtask_step_timeaudit` pst ON pst.`processtask_step_id` = ps.id + LEFT JOIN `processtask_step_user` psu ON psu.`processtask_id` = + ps.`processtask_id` AND psu.`processtask_step_id` = ps.id + LEFT JOIN `processtask_step_worker` psw + ON psw.`processtask_id` = ps.`processtask_id` AND psw.`processtask_step_id` = ps.id + LEFT JOIN + `processtask_step_worker_policy` pswp + ON pswp.`processtask_id` = ps.`processtask_id` AND pswp.`processtask_step_id` = ps.id + WHERE ps.`processtask_id` = #{value} + + + + delete + from `processtask` + where `id` = #{value} + + + + DELETE + FROM `processtask_step_agent` + WHERE `processtask_step_id` = #{value} + + + + DELETE + FROM `processtask_tag` + WHERE `processtask_id` = #{value} + + + + DELETE + FROM `processtask_step_in_operation` + WHERE `id` = #{id} + + + + DELETE + FROM `processtask_step_in_operation` + WHERE `processtask_id` = #{value} + + + + DELETE + FROM `processtask_step_worker` + where `processtask_step_id` = #{processTaskStepId} + and `user_type` = 'minor' + + + + DELETE + FROM `processtask_step_user` + where `processtask_step_id` = #{processTaskStepId} + and `user_type` = 'minor' + + + + DELETE + FROM `processtask_repeat` + WHERE `processtask_id` = #{processTaskId} + + + + DELETE + FROM `processtask_step_reapproval_restore_backup` + WHERE `backup_step_id` = #{value} + + + + DELETE + FROM `processtask_step_automatic_request` + WHERE `id` = #{value} + + + + DELETE + FROM `processtask_step_automatic_request` + WHERE `processtask_step_id` = #{value} + + + + DELETE + FROM `processtask_step_timer` + WHERE `processtask_step_id` = #{value} + + + + DELETE + FROM `processtask_time_cost` + WHERE `processtask_id` = #{value} + + + + DELETE + FROM `processtask_form_content` + WHERE `hash` = #{value} + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSerialNumberMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSerialNumberMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..db737768a23d5824230b281a9d9237d73b49bf15 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSerialNumberMapper.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.processtask; + +import neatlogic.framework.process.crossover.IProcessTaskSerialNumberCrossoverMapper; +import neatlogic.framework.process.dto.ProcessTaskSerialNumberPolicyVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ProcessTaskSerialNumberMapper extends IProcessTaskSerialNumberCrossoverMapper { + + ProcessTaskSerialNumberPolicyVo getProcessTaskSerialNumberPolicyLockByChannelTypeUuid(String channelTypeUuid); + + ProcessTaskSerialNumberPolicyVo getProcessTaskSerialNumberPolicyByChannelTypeUuid(String channelTypeUuid); + + List getProcessTaskSerialNumberPolicyListByHandler(String handler); + + int insertProcessTaskSerialNumberPolicy(ProcessTaskSerialNumberPolicyVo policyVo); + + int insertProcessTaskSerialNumber(@Param("processTaskId") Long processTaskId, @Param("serialNumber") String serialNumber); + + int updateProcessTaskSerialNumberPolicyByChannelTypeUuid(ProcessTaskSerialNumberPolicyVo policyVo); + + int updateProcessTaskSerialNumberPolicySerialNumberSeedByChannelTypeUuid(@Param("channelTypeUuid") String channelTypeUuid, @Param("serialNumberSeed") Long serialNumberSeed); + + int updateProcessTaskSerialNumberPolicyStartTimeByChannelTypeUuid(String channelTypeUuid); + + int updateProcessTaskSerialNumberPolicyEndTimeByChannelTypeUuid(String channelTypeUuid); + + int deleteProcessTaskSerialNumberPolicyByChannelTypeUuid(String channelTypeUuid); + + int deleteProcessTaskSerialNumberByProcessTaskId(Long processTaskId); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSerialNumberMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSerialNumberMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..ed4ffebe553880d3b6fd6f5bf1f27041b4c585e4 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSerialNumberMapper.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + INSERT INTO `processtask_serial_number_policy` ( + `channel_type_uuid`, + `handler`, + `config`, + `serial_number_seed` + ) + VALUES + ( + #{channelTypeUuid}, + #{handler}, + #{configStr}, + #{serialNumberSeed} + ) + + + + INSERT IGNORE INTO `processtask_serial_number` (`processtask_id`, `serial_number`) VALUES (#{processTaskId}, #{serialNumber}) + + + + UPDATE `processtask_serial_number_policy` + SET + `handler` = #{handler}, + `config` = #{configStr} + WHERE `channel_type_uuid` = #{channelTypeUuid} + + + + UPDATE `processtask_serial_number_policy` SET `serial_number_seed` = #{serialNumberSeed} + WHERE + `channel_type_uuid` = #{channelTypeUuid} + + + + UPDATE `processtask_serial_number_policy` SET `start_time` = NOW(3), `end_time` = NULL + WHERE + `channel_type_uuid` = #{channelTypeUuid} + + + + UPDATE `processtask_serial_number_policy` SET `end_time` = NOW(3) + WHERE + `channel_type_uuid` = #{channelTypeUuid} + + + + DELETE FROM `processtask_serial_number_policy` WHERE `channel_type_uuid` = #{value} + + + + DELETE FROM `processtask_serial_number` WHERE `processtask_id` = #{value} + + \ No newline at end of file diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..9989e230c512bfe0680a98ec5d96a8f854f5896c --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.java @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.processtask; + +import neatlogic.framework.process.crossover.IProcessTaskSlaCrossoverMapper; +import neatlogic.framework.process.dto.*; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author linbq + * @since 2021/11/28 15:53 + **/ +public interface ProcessTaskSlaMapper extends IProcessTaskSlaCrossoverMapper { + + List getAllProcessTaskSlaTransfer(); + + ProcessTaskSlaTransferVo getProcessTaskSlaTransferById(Long id); + + List getProcessTaskSlaTransferBySlaId(Long slaId); + + List getAllProcessTaskSlaNotify(); + + ProcessTaskSlaNotifyVo getProcessTaskSlaNotifyById(Long id); + + List getProcessTaskSlaNotifyBySlaId(Long slaId); + + ProcessTaskSlaVo getProcessTaskSlaById(Long id); + + List getSlaIdListByProcessTaskId(Long processTaskId); + + String getProcessTaskSlaConfigById(Long id); + + ProcessTaskSlaVo getProcessTaskSlaLockById(Long id); + + List getProcessTaskSlaTimeByProcessTaskStepIdList(List processTaskStepIdList); + + List getProcessTaskSlaTimeListBySlaIdList(List slaIdList); + + ProcessTaskSlaTimeVo getProcessTaskSlaTimeBySlaId(Long slaId); + + List getSlaIdListByProcessTaskStepId(Long processTaskStepId); + + List getProcessTaskStepIdListBySlaId(Long slaId); + + int getDoingOrPauseSlaIdCountByWorktimeUuid(String worktimeUuid); + + List getDoingOrPauseSlaIdListByWorktimeUuid(@Param("worktimeUuid") String worktimeUuid, @Param("startNum") int startNum, @Param("pageSize") int pageSize); + + int insertProcessTaskSlaNotify(ProcessTaskSlaNotifyVo processTaskSlaNotifyVo); + + int insertProcessTaskSlaTransfer(ProcessTaskSlaTransferVo processTaskSlaTransferVo); + + int insertProcessTaskSla(ProcessTaskSlaVo processTaskSlaVo); + + int insertProcessTaskSlaTime(ProcessTaskSlaTimeVo processTaskSlaTimeVo); + + int insertProcessTaskStepSla(@Param("processTaskStepId") Long processTaskStepId, @Param("slaId") Long slaId); + + int insertProcessTaskStepSlaTime(ProcessTaskStepSlaTimeVo processTaskStepSlaTimeVo); + + int updateProcessTaskSlaTransfer(ProcessTaskSlaTransferVo processTaskSlaTransferVo); + + int updateProcessTaskSlaNotify(ProcessTaskSlaNotifyVo processTaskNotifyVo); + + int updateProcessTaskSlaTime(ProcessTaskSlaTimeVo processTaskSlaTimeVo); + + int updateProcessTaskSlaIsActiveBySlaId(ProcessTaskSlaVo processTaskSlaVo); + + int deleteProcessTaskSlaNotifyById(Long id); + + int deleteProcessTaskSlaTransferById(Long id); + + int deleteProcessTaskSlaTransferBySlaId(Long slaId); + + int deleteProcessTaskSlaNotifyBySlaId(Long slaId); + + int deleteProcessTaskSlaTimeBySlaId(Long slaId); + + int deleteProcessTaskStepSlaTimeBySlaId(Long slaId); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..05e01f1be400d6ba51ff5d7f1589c98db30e7059 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskSlaMapper.xml @@ -0,0 +1,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select LAST_INSERT_ID() as id + + INSERT INTO `processtask_sla_notify` ( + `sla_id`, + `hash`, + `trigger_time`, + `config` + ) + VALUES + ( + #{slaId}, + #{hash}, + #{triggerTime}, + #{config} + ) + + + + + select LAST_INSERT_ID() as id + + INSERT INTO `processtask_sla_transfer` ( + `sla_id`, + `hash`, + `trigger_time`, + `config` + ) + VALUES + ( + #{slaId}, + #{hash}, + #{triggerTime}, + #{config} + ) + + + + + select LAST_INSERT_ID() as id + + INSERT INTO `processtask_sla` ( + `processtask_id`, + `name`, + `is_active`, + `config` + ) + VALUES + ( + #{processTaskId}, + #{name}, + #{isActive}, + #{config} + ) + + + + INSERT INTO `processtask_sla_time` ( + `sla_id`, + `time_sum`, + `expire_time`, + `realexpire_time`, + `time_left`, + `realtime_left`, + `status`, + `calculation_time` + ) + VALUES ( + #{slaId}, + #{timeSum}, + #{expireTime}, + #{realExpireTime}, + #{timeLeft}, + #{realTimeLeft}, + #{status}, + #{calculationTime} + ) + + + + INSERT INTO `processtask_step_sla` (`processtask_step_id`, `sla_id`) + VALUES (#{processTaskStepId}, #{slaId}); + + + + INSERT INTO `processtask_step_sla_time` ( + `processtask_id`, + `processtask_step_id`, + `type`, + `sla_id`, + `time_sum`, + `time_cost`, + `realtime_cost`, + `is_timeout` + ) + VALUES + ( + #{processTaskId}, + #{processTaskStepId}, + #{type}, + #{slaId}, + #{timeSum}, + #{timeCost}, + #{realTimeCost}, + #{isTimeout} + ) + + + + UPDATE `processtask_sla_transfer` + SET `trigger_time` = #{triggerTime} + WHERE `id` = #{id} + + + + UPDATE `processtask_sla_notify` + SET `trigger_time` = #{triggerTime} + WHERE `id` = #{id} + + + + UPDATE + `processtask_sla_time` + SET `expire_time` = #{expireTime}, + `realexpire_time` = #{realExpireTime}, + `time_left` = #{timeLeft}, + `realtime_left` = #{realTimeLeft}, + `time_sum` = #{timeSum}, + `status` = #{status}, + `calculation_time` = #{calculationTime} + WHERE `sla_id` = #{slaId} + + + + UPDATE `processtask_sla` SET `is_active` = #{isActive} WHERE `id` = #{id} + + + + DELETE FROM `processtask_sla_notify` WHERE `id` = #{value} + + + + DELETE FROM `processtask_sla_transfer` WHERE `id` = #{value} + + + + DELETE FROM `processtask_sla_transfer` WHERE `sla_id` = #{value} + + + + DELETE FROM `processtask_sla_notify` WHERE `sla_id` = #{value} + + + + DELETE FROM `processtask_sla_time` WHERE `sla_id` = #{value} + + + + DELETE FROM `processtask_step_sla_time` WHERE `sla_id` = #{value} + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..3cb5f20da4af4fc50cd8449a3ec8dc0fd380a2a4 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.processtask; + +import neatlogic.framework.process.crossover.IProcessTaskStepDataCrossoverMapper; +import neatlogic.framework.process.dto.ProcessTaskStepDataVo; + +public interface ProcessTaskStepDataMapper extends IProcessTaskStepDataCrossoverMapper { + ProcessTaskStepDataVo getProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); + +// List searchProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); + + int replaceProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); + + int deleteProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); + + int deleteProcessTaskStepDataById(Long id); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..c1931f71126e4d48513b27a834a733b9416e5035 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + REPLACE INTO `processtask_step_data` (`id`, + `processtask_id`, + `processtask_step_id`, + `data`, + `type`, + `fcu`) + VALUES (#{id}, + #{processTaskId}, + #{processTaskStepId}, + #{dataStr,typeHandler=CompressHandler}, + #{type}, + #{fcu}) + + + + DELETE + FROM `processtask_step_data` + WHERE `processtask_id` = #{processTaskId} + AND `processtask_step_id` = #{processTaskStepId} + AND `type` = #{type} + AND `fcu` = #{fcu} + + + + DELETE + FROM `processtask_step_data` + WHERE `id` = #{id} + + \ No newline at end of file diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..706988ce04fd0f2adc4db618d33d7167e7a068ef --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.java @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.processtask; + +import neatlogic.framework.process.crossover.IProcessTaskStepTaskCrossoverMapper; +import neatlogic.framework.process.dto.*; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author lvzk + * @since 2021/9/1 14:18 + **/ +public interface ProcessTaskStepTaskMapper extends IProcessTaskStepTaskCrossoverMapper { + + int getInvokedCountByTaskConfigId(Long taskId); + + ProcessTaskStepTaskVo getStepTaskDetailById(Long processTaskStepTaskId); + + ProcessTaskStepTaskVo getStepTaskById(Long processTaskStepTaskId); + + ProcessTaskStepTaskVo getStepTaskLockById(Long processTaskStepTaskId); + + ProcessTaskStepTaskUserVo getStepTaskUserByTaskIdAndTaskUserIdAndUserUuid(@Param("processTaskStepTaskId") Long processtaskStepTaskId, @Param("processTaskStepTaskUserId") Long processTaskStepTaskUserId, @Param("userUuid") String userUuid); + + ProcessTaskStepTaskUserVo getStepTaskUserById(Long id); + + List getStepTaskByProcessTaskStepId(Long processTaskStepId); + + List getStepTaskListByProcessTaskStepId(Long processTaskStepId); + + List getStepTaskUserByStepTaskIdList(@Param("stepTaskIdList") List collect); + + List getStepTaskUserByStepTaskIdListAndUserUuid(@Param("stepTaskIdList") List collect, @Param("userUuid") String userUuid); + + List getStepTaskWithUserByProcessTaskStepId(Long processTaskStepId); + + List getStepTaskUserContentByStepTaskUserIdList(@Param("stepTaskUserIdList") List collect); + + ProcessTaskStepTaskUserContentVo getStepTaskUserContentByIdAndUserUuid(@Param("userContentId") Long processTaskStepTaskUserContentId, @Param("userUuid") String userUuid); + + ProcessTaskStepTaskUserContentVo getStepTaskUserContentById(Long id); + + List getStepTaskUserListByTaskIdAndStatus(@Param("processtaskStepTaskId") Long processtaskStepTaskId, @Param("status") String status); + + List getStepTaskUserListByStepTaskId(Long processtaskStepTaskId); + + List getStepTaskUserListByProcessTaskStepId(Long processTaskStepId); + + List getStepTaskUserByTaskIdAndUserUuid(@Param("processTaskStepTaskId") Long processTaskStepTaskId, @Param("userUuid") String userUuid); + + ProcessTaskStepTaskUserContentVo getStepTaskUserContentByStepTaskUserId(Long processTaskStepTaskUserId); + + ProcessTaskStepTaskUserAgentVo getProcessTaskStepTaskUserAgentByStepTaskUserId(Long stepTaskUserId); + + List getProcessTaskStepTaskUserAgentListByStepTaskUserIdList(List stepTaskUserIdList); + + List getProcessTaskStepTaskUserAgentListByStepTaskIdList(List stepTaskIdList); + + List getStepTaskUserFileListByStepTaskUserIdList(List stepTaskUserIdList); + + int insertTask(ProcessTaskStepTaskVo processTaskStepTaskVo); + + int insertIgnoreTaskUser(ProcessTaskStepTaskUserVo processTaskStepTaskUserVo); + + int insertTaskUser(ProcessTaskStepTaskUserVo processTaskStepTaskUserVo); + + int insertTaskUserContent(ProcessTaskStepTaskUserContentVo processTaskStepTaskUserContentVo); + + int insertProcessTaskStepTaskUserAgent(ProcessTaskStepTaskUserAgentVo processTaskStepTaskUserAgentVo); + + int insertProcessTaskStepTaskUserFile(ProcessTaskStepTaskUserFileVo processTaskStepTaskUserFileVo); + + int updateTask(ProcessTaskStepTaskVo processTaskStepTaskVo); + + int updateTaskUserByTaskIdAndUserUuid(@Param("status") String status, @Param("processTaskStepTaskId") Long processtaskStepTaskId, @Param("userUuid") String userUuid); + + int updateTaskUserById(ProcessTaskStepTaskUserVo processTaskStepTaskUserVo); + + int updateDeleteTaskUserByUserListAndId(@Param("userList") List userList, @Param("processTaskStepTaskId") Long processTaskStepTaskId, @Param("isDelete") Integer isDelete); + + int updateTaskUserContent(@Param("processTaskStepTaskUserContentId") Long processTaskStepTaskUserContentId, @Param("contentHash") String contentHash, @Param("userUuid") String userUuid); + + int updateTaskUserContentById(ProcessTaskStepTaskUserContentVo userContentVo); + + int updateTaskUserIsDeleteByIdList(@Param("idList") List idList, @Param("isDelete") Integer isDelete); + + int deleteTaskById(Long processTaskStepTaskId); + + int deleteTaskUserByTaskId(Long processTaskStepTaskId); + + int deleteTaskUserContentByTaskId(Long processTaskStepTaskId); + + int deleteProcessTaskStepTaskUserAgentByStepTaskUserId(Long stepTaskUserId); + + int deleteProcessTaskStepTaskUserAgentByStepTaskUserIdList(List stepTaskUserIdList); + + int deleteProcessTaskStepTaskUserAgentByStepTaskId(Long processTaskStepTaskId); + + int deleteProcessTaskStepTaskUserFile(ProcessTaskStepTaskUserFileVo processTaskStepTaskUserFileVo); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..37aa259ed5e6c65c502895bfb4254274c2b8a87c --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.xml @@ -0,0 +1,616 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO `processtask_step_task` (`processtask_id`, + `processtask_step_id`, + `id`, + `owner`, + `create_time`, + `content_hash`, + `task_config_id`) + VALUES (#{processTaskId}, + #{processTaskStepId}, + #{id}, + #{owner}, + now(3), + #{contentHash}, + #{taskConfigId}) + + + + INSERT IGNORE INTO `processtask_step_task_user` (`id`, + `processtask_step_task_id`, + `user_uuid`, + `status`) + VALUES (#{id}, + #{processTaskStepTaskId}, + #{userUuid}, + #{status}); + + + + + INSERT INTO `processtask_step_task_user` ( + `id`, + `processtask_step_task_id`, + `user_uuid`, + `status`) + VALUES ( + #{id}, + #{processTaskStepTaskId}, + #{userUuid}, + #{status}) + + + + INSERT INTO `processtask_step_task_user_content` (`id`, + `processtask_step_task_id`, + `processtask_step_task_user_id`, + `user_uuid`, + `content_hash`, + `fcd`) + VALUES (#{id}, + #{processTaskStepTaskId}, + #{processTaskStepTaskUserId}, + #{userUuid}, + #{contentHash}, + now(3)) + + + + INSERT INTO `processtask_step_task_user_agent` ( + `processtask_step_task_user_id`, + `processtask_step_task_id`, + `user_uuid`, + `agent_uuid` + ) + VALUES + ( + #{processTaskStepTaskUserId}, + #{processTaskStepTaskId}, + #{userUuid}, + #{agentUuid} + ) + + + + INSERT IGNORE INTO `processtask_step_task_user_file` ( + `processtask_step_task_id`, + `processtask_step_task_user_id`, + `file_id`, + `fcd` + ) + VALUES + ( + #{processTaskStepTaskId}, + #{processTaskStepTaskUserId}, + #{fileId}, + NOW() + ) + + + + UPDATE + `processtask_step_task` + SET `owner` = #{owner}, + `content_hash` = #{contentHash} + WHERE `id` = #{id}; + + + + UPDATE + `processtask_step_task_user` + SET `end_time` = now(3), + `status` = #{status} + WHERE `processtask_step_task_id` = #{processTaskStepTaskId} + and `user_uuid` = #{userUuid} + + + + UPDATE + `processtask_step_task_user` + SET `end_time` = now(3), + `user_uuid` = #{userUuid}, + `status` = #{status} + WHERE `id` = #{id} + + + + update `processtask_step_task_user_content` + set `content_hash` = #{contentHash}, + `lcd` = now(3) + where `id` = #{processTaskStepTaskUserContentId} + and `user_uuid` = #{userUuid} + + + + update `processtask_step_task_user_content` + set `content_hash` = #{contentHash}, + `user_uuid` = #{userUuid}, + `lcd` = now(3) + where `id` = #{id} + + + + UPDATE `processtask_step_task_user` + SET `is_delete` = #{isDelete} + WHERE `id` IN + + #{id} + + + + + UPDATE `processtask_step_task_user` + SET + `is_delete` = #{isDelete} + WHERE `user_uuid` + + not + + in + + #{userUuid} + + and `processtask_step_task_id` = #{processTaskStepTaskId} + + + + DELETE + FROM `processtask_step_task` + WHERE `id` = #{value}; + + + + DELETE + FROM `processtask_step_task_user` + WHERE `processtask_step_task_id` = #{value}; + + + + DELETE + FROM `processtask_step_task_user_content` + WHERE `processtask_step_task_id` = #{value}; + + + + DELETE FROM `processtask_step_task_user_agent` WHERE `processtask_step_task_user_id` = #{value} + + + + DELETE FROM `processtask_step_task_user_agent` + WHERE `processtask_step_task_user_id` in + + #{stepTaskUserId} + + + + + DELETE FROM `processtask_step_task_user_agent` WHERE `processtask_step_task_id` = #{value} + + + + DELETE FROM `processtask_step_task_user_file` + WHERE `processtask_step_task_id` = #{processTaskStepTaskId} + AND `processtask_step_task_user_id` = #{processTaskStepTaskUserId} + AND `file_id` = #{fileId} + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..2b6c941c7bed023530451f75ca753232aa9b5ed0 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.processtask; + +import neatlogic.framework.process.crossover.IProcessTaskStepTimeAuditCrossoverMapper; +import neatlogic.framework.process.dto.ProcessTaskStepTimeAuditVo; + +import java.util.List; + +public interface ProcessTaskStepTimeAuditMapper extends IProcessTaskStepTimeAuditCrossoverMapper { + List getProcessTaskStepTimeAuditBySlaId(Long slaId); + + ProcessTaskStepTimeAuditVo getLastProcessTaskStepTimeAuditByStepId(Long processTaskStepId); + + int updateProcessTaskStepTimeAudit(ProcessTaskStepTimeAuditVo processTaskStepTimeAuditVo); + + int insertProcessTaskStepTimeAudit(ProcessTaskStepTimeAuditVo processTaskStepTimeAuditVo); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..5ca4788be9f8962828aa3717d8a1d7a5264d21e3 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTimeAuditMapper.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + select LAST_INSERT_ID() as id + + INSERT INTO `processtask_step_timeaudit` ( + `processtask_step_id` + + ,`active_time` + ,`start_time` + ,`abort_time` + ,`complete_time` + ,`back_time` + ,`pause_time` + + ) + VALUES + ( + #{processTaskStepId} + + ,NOW(3) + ,NOW(3) + ,NOW(3) + ,NOW(3) + ,NOW(3) + ,NOW(3) + + ) + + + + UPDATE + `processtask_step_timeaudit` + SET + `processtask_step_id` = #{processTaskStepId} + + ,`active_time` = NOW(3) + ,`start_time` = NOW(3) + ,`abort_time` = NOW(3) + ,`complete_time` = NOW(3) + ,`back_time` = NOW(3) + ,`pause_time` = NOW(3) + + WHERE `id` = #{id} + + \ No newline at end of file diff --git a/src/main/java/neatlogic/module/process/dao/mapper/score/ProcessTaskScoreMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/score/ProcessTaskScoreMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ed24fe76c9abef0da03d93e39e3a26622d5e20da --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/score/ProcessTaskScoreMapper.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.score; + +import neatlogic.framework.process.crossover.IProcessTaskScoreCrossoverMapper; +import neatlogic.framework.process.dto.score.ProcessTaskAutoScoreVo; +import neatlogic.framework.process.dto.score.ProcessTaskScoreVo; + +import java.util.List; + +public interface ProcessTaskScoreMapper extends IProcessTaskScoreCrossoverMapper { + + List getProcessTaskScoreByProcesstaskId(Long processtaskId); + + List getProcessTaskScoreWithContentHashByProcessTaskId(Long processtaskId); + + List getAllProcessTaskAutoScoreProcessTaskIdList(); + + String getProcessTaskAutoScoreConfigByProcessTaskId(Long processTaskId); + + String getProcessTaskScoreContentHashByProcessTaskId(Long processTaskId); + + void insertProcessTaskScore(ProcessTaskScoreVo vo); + + void insertProcessTaskScoreContent(ProcessTaskScoreVo vo); + + int insertProcessTaskAutoScore(ProcessTaskAutoScoreVo processTaskAutoScoreVo); + + int updateProcessTaskAutoScoreByProcessTaskId(ProcessTaskAutoScoreVo processTaskAutoScoreVo); + + int deleteProcessTaskByProcessTaskId(Long processTaskId); + + int deleteProcessTaskAutoScoreByProcessTaskId(Long processTaskId); +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/score/ProcessTaskScoreMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/score/ProcessTaskScoreMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..3659ef5609a426d9d7bb522f17b7f3b847b70b2d --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/score/ProcessTaskScoreMapper.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + INSERT INTO `processtask_score` ( + `processtask_id`, + `score_template_id`, + `score_dimension_id`, + `score`, + `is_auto`, + `fcu`, + `fcd` + ) VALUES ( + #{processTaskId}, + #{scoreTemplateId}, + #{scoreDimensionId}, + #{score}, + #{isAuto}, + #{fcu}, + NOW(3) + ) + + + + INSERT INTO `processtask_score_content` ( + `processtask_id`, + `content_hash`, + `fcu`, + `fcd` + ) VALUES ( + #{processTaskId}, + #{contentHash}, + #{fcu}, + NOW(3) + ) + + + + INSERT INTO `processtask_auto_score` ( + `processtask_id`, + `config` + ) + VALUES + ( + #{processTaskId}, + #{config} + ) + + + + UPDATE `processtask_auto_score` SET `trigger_time` = #{triggerTime} WHERE `processtask_id` = #{processTaskId} + + + + DELETE ps,psc,pst + FROM `processtask_score` ps + JOIN `processtask_score_content` psc ON ps.`processtask_id` = psc.`processtask_id` + JOIN `processtask_score_template` pst ON ps.`processtask_id` = pst.`processtask_id` + WHERE ps.`processtask_id` = #{value} + + + + DELETE FROM `processtask_auto_score` WHERE `processtask_id` = #{value} + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..c6fac17cf6761794735c265df8bb87f93b6b03ea --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.score; + +import neatlogic.framework.common.dto.ValueTextVo; +import neatlogic.framework.process.crossover.IChannelTypeCrossoverMapper; +import neatlogic.framework.process.dto.score.ProcessScoreTemplateVo; +import neatlogic.framework.process.dto.score.ScoreTemplateDimensionVo; +import neatlogic.framework.process.dto.score.ScoreTemplateVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ScoreTemplateMapper extends IChannelTypeCrossoverMapper { + + List searchScoreTemplate(ScoreTemplateVo scoreTemplateVo); + + List searchScoreTemplateForSelect(ScoreTemplateVo scoreTemplateVo); + + int searchScoreTemplateCount(ScoreTemplateVo scoreTemplateVo); + + ScoreTemplateVo getScoreTemplateById(@Param("id") Long id); + + ScoreTemplateVo getScoreTemplateByName(String name); + + int checkScoreTemplateNameIsRepeat(ScoreTemplateVo scoreTemplateVo); + + ScoreTemplateVo checkScoreTemplateExistsById(@Param("id") Long id); + + List getRefProcessList(ScoreTemplateVo scoreTemplateVo); + + int getRefProcessCount(@Param("scoreTemplateId") Long scoreTemplateId); + + List getProcessCountByIdList(List scoreTemplateIdList); + + ProcessScoreTemplateVo getProcessScoreTemplateByProcessUuid(String processUuid); + + List getScoreTemplateDimensionListByScoreTemplateId(Long scoreTemplateId); + + void updateScoreTemplate(ScoreTemplateVo scoreTemplateVo); + + void updateScoreTemplateStatus(ScoreTemplateVo scoreTemplateVo); + + void insertScoreTemplate(ScoreTemplateVo scoreTemplateVo); + + void insertScoreTemplateDimension(ScoreTemplateDimensionVo scoreTemplateDimensionVo); + + void insertProcessScoreTemplate(ProcessScoreTemplateVo processScoreTemplateVo); + + void deleteScoreTemplate(@Param("scoreTemplateId") Long scoreTemplateId); + + void deleteScoreTemplateDimension(@Param("scoreTemplateId") Long scoreTemplateId); + + void deleteProcessScoreTemplateByProcessUuid(String processUuid); + +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..05c6fb2125922e9c4872d13800fc1ccaf2da4fdd --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE `score_template` SET + `name` = #{name}, + `description` = #{description}, + `is_active` = #{isActive}, + `lcu` = #{lcu}, + `lcd` = NOW(3) + WHERE `id` = #{id} + + + + UPDATE `score_template` SET + `is_active` = #{isActive}, + `lcu` = #{lcu}, + `lcd` = NOW(3) + WHERE `id` = #{id} + + + + INSERT INTO `score_template` ( + `id`, + `name`, + `description`, + `is_active`, + `fcu`, + `fcd`, + `lcu`, + `lcd` + ) VALUES ( + #{id}, + #{name}, + #{description}, + #{isActive}, + #{fcu}, + NOW(3), + #{fcu}, + NOW(3) + ) + + + + INSERT INTO `score_template_dimension` ( + `id`, + `score_template_id`, + `name`, + `description` + ) VALUES ( + #{id}, + #{scoreTemplateId}, + #{name}, + #{description} + ) + + + + INSERT INTO `process_score_template` ( + `score_template_id`, + `process_uuid`, + `is_auto`, + `config` + ) VALUES ( + #{scoreTemplateId}, + #{processUuid}, + #{isAuto}, + #{config} + ) + + + + DELETE st,std + FROM `score_template` st + left join `score_template_dimension` std + on st.`id` = std.`score_template_id` + WHERE st.`id` = #{scoreTemplateId} + + + + DELETE FROM `score_template_dimension` WHERE `score_template_id` = #{scoreTemplateId} + + + + DELETE FROM `process_score_template` WHERE `process_uuid` = #{value} + + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..cbafae1f3fc9899dc695eff3329e15e4a46df28b --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.java @@ -0,0 +1,57 @@ +/*Copyright (C) 2023 深圳极向量科技有限公司 All Rights Reserved. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see .*/ + +package neatlogic.module.process.dao.mapper.task; + +import neatlogic.framework.common.dto.BasePageVo; +import neatlogic.framework.common.dto.ValueTextVo; +import neatlogic.framework.process.dto.TaskConfigVo; +import com.alibaba.fastjson.JSONArray; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @author lvzk + * @since 2021/9/1 14:18 + **/ +public interface TaskMapper { + + int searchTaskConfigCount(TaskConfigVo taskConfigVo); + + List searchTaskConfig(TaskConfigVo taskConfigVo); + + int checkTaskConfigNameIsRepeat(TaskConfigVo taskConfigVo); + + TaskConfigVo getTaskConfigById(Long taskId); + + TaskConfigVo getTaskConfigByName(String name); + + List getTaskConfigByIdList(JSONArray stepTaskIdList); + + List> getTaskConfigReferenceCountMap(List idList); + + List getTaskConfigReferenceProcessList(@Param("taskConfigId") Long taskConfigId,@Param("basePageVo") BasePageVo basePageVo); + + int getTaskConfigReferenceProcessCount(Long taskConfigId); + + int updateTaskConfig(TaskConfigVo taskConfigVo); + + int insertTaskConfig(TaskConfigVo taskConfigVo); + + int deleteTaskConfigById(Long taskId); + +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..e1552a6c68c478c32ccc341134650a8a8d0d2782 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.xml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + UPDATE + `task_config` + SET `name` = #{name}, + `num` = #{num}, + `policy` = #{policy}, + `is_active` = #{isActive}, + `config` = #{configStr}, + `lcd` = now(3), + `lcu` = #{lcu} + WHERE `id` = #{id}; + + + + INSERT INTO `task_config` (`id`, + `name`, + `num`, + `policy`, + `is_active`, + `config`, + `fcd`, + `fcu`, + `lcd`, + `lcu`) + VALUES (#{id}, + #{name}, + #{num}, + #{policy}, + #{isActive}, + #{configStr}, + now(3), + #{fcu}, + now(3), + #{fcu}); + + + + DELETE + FROM `task_config` + WHERE `id` = #{value} + + diff --git a/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..02da41551524763c5fe4fbcc467f66e748d3da16 --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.dao.mapper.workcenter; + +import neatlogic.framework.process.workcenter.dto.*; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface WorkcenterMapper { + List getAllWorkcenterConditionConfig(); + + List getAuthorizedWorkcenterUuidList( + @Param("userUuid") String userUuid, + @Param("teamUuidList") List teamUuidList, + @Param("roleUuidList") List roleUuidList, + @Param("deviceType") String deviceType, + @Param("isHasModifiedAuth") int isHasModifiedAuth, + @Param("isHasNewTypeAuth") int isHasNewTypeAuth + ); + + List getAuthorizedWorkcenterListByUuidList(@Param("uuidList") List uuidList); + + List getWorkcenterCatalogListByName(String keyword); + + Integer checkWorkcenterNameIsRepeat(@Param("name") String workcenterName, @Param("uuid") String workcenterUuid); + + WorkcenterCatalogVo getWorkcenterCatalogByName(String name); + + int checkWorkcenterCatalogNameIsRepeats(WorkcenterCatalogVo vo); + + int checkWorkcenterCatalogIsExists(Long id); + + int checkWorkcenterCatalogIsUsed(Long id); + + WorkcenterVo getWorkcenterByUuid(@Param("uuid") String workcenterUuid); + + //Map getWorkcenterConditionConfig(); + + List getWorkcenterThead(WorkcenterTheadVo workcenterTheadVo); + + List getWorkcenterVoListByUuidList(@Param("uuidList") List uuidList); + + List getWorkcenterAuthorityVoListByUuidList(@Param("uuidList") List uuidList); + + WorkcenterUserProfileVo getWorkcenterUserProfileByUserUuid(String userUuid); + + Integer deleteWorkcenterUserProfileByUserUuid(String userUuid); + + Integer deleteWorkcenterByUuid(@Param("workcenterUuid") String workcenterUuid); + + Integer deleteWorkcenterAuthorityByUuid(@Param("workcenterUuid") String workcenterUuid); + + Integer deleteWorkcenterOwnerByUuid(@Param("workcenterUuid") String workcenterUuid); + + Integer deleteWorkcenterThead(WorkcenterTheadVo workcenterTheadVo); + + void deleteWorkcenterCatalogById(Long id); + + void insertWorkcenter(WorkcenterVo workcenterVo); + + Integer insertWorkcenterAuthority(WorkcenterAuthorityVo authorityVo); + + Integer insertWorkcenterOwner(@Param("userUuid") String owner, @Param("uuid") String workcenterUuid); + + Integer insertWorkcenterThead(WorkcenterTheadVo workcenterTheadVo); + + Integer insertWorkcenterUserProfile(WorkcenterUserProfileVo workcenterUserProfileVo); + + Integer updateWorkcenter(WorkcenterVo workcenterVo); + + Integer updateWorkcenterCondition(WorkcenterVo workcenterVo); + + Integer insertWorkcenterCatalog(WorkcenterCatalogVo catalogVo); + + +} diff --git a/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..25ea39456ab715a698471a1cdc2a82526db8960b --- /dev/null +++ b/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.xml @@ -0,0 +1,386 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DELETE + FROM `process_workcenter` + WHERE `uuid` = #{workcenterUuid}; + + + + DELETE + FROM `process_workcenter_authority` + WHERE `workcenter_uuid` = #{workcenterUuid}; + + + + DELETE + FROM `process_workcenter_owner` + WHERE `workcenter_uuid` = #{workcenterUuid}; + + + + DELETE + FROM + `process_workcenter_thead` + + `workcenter_uuid` = #{workcenterUuid} + + and `user_uuid` = #{userUuid} + + + + + + DELETE + FROM `process_workcenter_user_profile` + WHERE `user_uuid` = #{userUuid}; + + + + DELETE + FROM `process_workcenter_catalog` + WHERE `id` = #{id} + + + + + INSERT INTO `process_workcenter` (`uuid`, + `name`, + `type`, + `sort`, + `condition_config`, + `is_show_total`, + `support`, + `catalog_id`) + VALUES (#{uuid}, + #{name}, + #{type}, + #{sort}, + #{conditionConfigStr}, + #{isShowTotal}, + #{support}, + #{catalogId}) + ON DUPLICATE KEY UPDATE `name` = #{name}, + `type` = #{type}, + `sort` = #{sort}, + `condition_config`=#{conditionConfigStr}, + `is_show_total`=#{isShowTotal}, + `support`= #{support}, + `catalog_id`= #{catalogId} + + + + INSERT INTO `process_workcenter_authority` (`workcenter_uuid`, `type`, + `uuid`) + VALUES (#{workcenterUuid}, + #{type}, + #{uuid}) + + + + INSERT INTO `process_workcenter_thead` (`workcenter_uuid`, + `name`, + `sort`, + `type`, + `is_show`, + `width`, + `user_uuid`, + `disabled`) + VALUES (#{workcenterUuid}, + #{name}, + #{sort}, + #{type}, + #{isShow}, + #{width}, + #{userUuid}, + 0); + + + + INSERT IGNORE INTO `process_workcenter_owner` (`workcenter_uuid`, `user_uuid`) + VALUES (#{uuid}, #{userUuid}); + + + + INSERT INTO `process_workcenter_user_profile` (`user_uuid`, `config`) + VALUES (#{user_uuid}, #{config}); + + + + UPDATE + `process_workcenter` + SET + + `name` = #{name}, + + `type` = #{type}, + `support` = #{support}, + `catalog_id` = #{catalogId}, + `is_show_total` = #{isShowTotal} + WHERE `uuid` = #{uuid} + + + + UPDATE + `process_workcenter` + SET `condition_config` = #{conditionConfigStr} + WHERE `uuid` = #{uuid} + + + + INSERT INTO `process_workcenter_catalog` (`id`, `name`) + VALUES (#{id}, #{name}) + ON DUPLICATE KEY + UPDATE `name` = #{name} + + + diff --git a/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java index 9c02f0da09a79d31973bd0980d88b5aa8cf75b73..838b04927cccd49aa0348a5b135ad51e6ce7039f 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java @@ -9,7 +9,7 @@ import neatlogic.framework.dependency.dto.DependencyInfoVo; import neatlogic.framework.dependency.dto.DependencyVo; import neatlogic.framework.process.constvalue.ProcessFromType; import neatlogic.framework.process.dto.ProcessVo; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/neatlogic/module/process/dependency/handler/FormProcessDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/FormProcessDependencyHandler.java index 746bfa2e7afa4d7e13c09867758e707273ea840c..0d6fa25f73eb6b2e0e3556f030723b58af25fee5 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/FormProcessDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/FormProcessDependencyHandler.java @@ -22,7 +22,7 @@ import neatlogic.framework.dependency.core.CustomTableDependencyHandlerBase; import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; import neatlogic.framework.process.dto.ProcessVo; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/neatlogic/module/process/dependency/handler/FormScene2ProcessStepDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/FormScene2ProcessStepDependencyHandler.java index 6770c021d39ed8f4213d467535674494bc89b7ec..1a4177a63c5c8b8607bac4ab75623b431f47d83f 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/FormScene2ProcessStepDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/FormScene2ProcessStepDependencyHandler.java @@ -24,7 +24,7 @@ import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; import neatlogic.framework.dependency.dto.DependencyVo; import neatlogic.framework.process.dto.ProcessVo; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/neatlogic/module/process/dependency/handler/IntegrationProcessDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/IntegrationProcessDependencyHandler.java index d6e5d4b8c8186bf4a220298dc1a52af218846327..90ab896c342ce7f434edd682a85526cbddabf3c5 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/IntegrationProcessDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/IntegrationProcessDependencyHandler.java @@ -22,7 +22,7 @@ import neatlogic.framework.dependency.core.CustomTableDependencyHandlerBase; import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; import neatlogic.framework.process.dto.ProcessVo; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/neatlogic/module/process/dependency/handler/IntegrationProcessStepDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/IntegrationProcessStepDependencyHandler.java index 51df1d6a14d8e383d513798dee71fff6a914e092..e578a60911ceb6f8168c4eaac84ee3bd31b431a1 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/IntegrationProcessStepDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/IntegrationProcessStepDependencyHandler.java @@ -23,7 +23,7 @@ import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessVo; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessDependencyHandler.java index 161a5bcb78dfe3eb14bdf16531162c85b36828cb..599a574a4cb4d3d89eac08878312fc0a9eef4fab 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessDependencyHandler.java @@ -22,7 +22,7 @@ import neatlogic.framework.dependency.core.CustomTableDependencyHandlerBase; import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; import neatlogic.framework.process.dto.ProcessVo; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessSlaDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessSlaDependencyHandler.java index 4952b5f02490e6e031784f8f33da1f0ff990b450..eee2c9ac845e37ca765a124ad470281d8cfe813a 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessSlaDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessSlaDependencyHandler.java @@ -23,7 +23,7 @@ import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; import neatlogic.framework.process.dto.ProcessSlaVo; import neatlogic.framework.process.dto.ProcessVo; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessStepDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessStepDependencyHandler.java index 45fd68ccdd7410c50316ae578e44ccf1f93d25fc..3abb1af2eba5cbef5c0cac4de60a11e98578cb14 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessStepDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/NotifyPolicyProcessStepDependencyHandler.java @@ -23,7 +23,7 @@ import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessVo; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/neatlogic/module/process/dependency/handler/WorktimeChannelDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/WorktimeChannelDependencyHandler.java index 28dd00e217e5728915cbdfccd3ed328113ad7159..518d9a990b75bd08dc1c03db31adf94232ec6013 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/WorktimeChannelDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/WorktimeChannelDependencyHandler.java @@ -20,7 +20,7 @@ import neatlogic.framework.dependency.constvalue.FrameworkFromType; import neatlogic.framework.dependency.core.CustomTableDependencyHandlerBase; import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelVo; import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service; diff --git a/src/main/java/neatlogic/module/process/file/ProcessFileHandler.java b/src/main/java/neatlogic/module/process/file/ProcessFileHandler.java index 2b72f477c25e6aabaf7289be0bb8c6f435644c0f..53a284008bc218e57b455f35e42c7226f4f8f750 100644 --- a/src/main/java/neatlogic/module/process/file/ProcessFileHandler.java +++ b/src/main/java/neatlogic/module/process/file/ProcessFileHandler.java @@ -22,7 +22,7 @@ import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.file.core.FileTypeHandlerBase; import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.process.crossover.ICatalogCrossoverService; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.processtask.ProcessTaskNotFoundException; import neatlogic.module.process.service.ProcessTaskService; diff --git a/src/main/java/neatlogic/module/process/fulltextindex/ProcessTaskFullTextIndexHandler.java b/src/main/java/neatlogic/module/process/fulltextindex/ProcessTaskFullTextIndexHandler.java index c4e553e4013ed0801f3e7057fcd6c3b20ac0cf30..675f8995f0dd56dcbff9bf87d8eeb7bd741225cf 100644 --- a/src/main/java/neatlogic/module/process/fulltextindex/ProcessTaskFullTextIndexHandler.java +++ b/src/main/java/neatlogic/module/process/fulltextindex/ProcessTaskFullTextIndexHandler.java @@ -23,8 +23,8 @@ import neatlogic.framework.fulltextindex.dto.fulltextindex.FullTextIndexTypeVo; import neatlogic.framework.fulltextindex.dto.fulltextindex.FullTextIndexVo; import neatlogic.framework.fulltextindex.dto.globalsearch.DocumentVo; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.fulltextindex.ProcessFullTextIndexType; import neatlogic.module.process.service.ProcessTaskService; diff --git a/src/main/java/neatlogic/module/process/groupsearch/ProcessUserTypeGroupHandler.java b/src/main/java/neatlogic/module/process/groupsearch/ProcessUserTypeGroupHandler.java index 5fbf4b7b61e76cb18a5aa316984b6599c2e23dd4..2dee5822d768a6d4bd88679faa3ee04406b519b0 100644 --- a/src/main/java/neatlogic/module/process/groupsearch/ProcessUserTypeGroupHandler.java +++ b/src/main/java/neatlogic/module/process/groupsearch/ProcessUserTypeGroupHandler.java @@ -18,7 +18,7 @@ package neatlogic.module.process.groupsearch; import com.alibaba.fastjson.JSONArray; import neatlogic.framework.process.constvalue.ProcessTaskGroupSearch; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.task.TaskMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import neatlogic.framework.process.dto.TaskConfigVo; import neatlogic.framework.restful.groupsearch.core.GroupSearchOptionVo; import neatlogic.framework.restful.groupsearch.core.GroupSearchVo; diff --git a/src/main/java/neatlogic/module/process/importexport/handler/CommentTemplateImportExportHandler.java b/src/main/java/neatlogic/module/process/importexport/handler/CommentTemplateImportExportHandler.java index b5dd06aa714f7c3b7006ed7afee43d32d1658430..7f1adbf1a0c7c2d8cdb52c184daec9e21faf8f00 100644 --- a/src/main/java/neatlogic/module/process/importexport/handler/CommentTemplateImportExportHandler.java +++ b/src/main/java/neatlogic/module/process/importexport/handler/CommentTemplateImportExportHandler.java @@ -6,7 +6,7 @@ import neatlogic.framework.importexport.dto.ImportExportBaseInfoVo; import neatlogic.framework.importexport.dto.ImportExportPrimaryChangeVo; import neatlogic.framework.importexport.dto.ImportExportVo; import neatlogic.framework.process.constvalue.ProcessImportExportHandlerType; -import neatlogic.framework.process.dao.mapper.ProcessCommentTemplateMapper; +import neatlogic.module.process.dao.mapper.process.ProcessCommentTemplateMapper; import neatlogic.framework.process.dto.ProcessCommentTemplateVo; import neatlogic.framework.process.exception.commenttemplate.ProcessCommentTemplateNotFoundException; import neatlogic.module.process.service.ProcessCommentTemplateService; diff --git a/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java b/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java index d9de8de2ce21f22edd147467a247925320a87190..683f6f3cf1149daef4aebcd4c24d1ea8d9802805 100644 --- a/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java +++ b/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java @@ -17,7 +17,7 @@ import neatlogic.framework.process.constvalue.ProcessImportExportHandlerType; import neatlogic.framework.process.dto.ProcessVo; import neatlogic.framework.process.exception.process.ProcessNotFoundException; import neatlogic.framework.util.UuidUtil; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.service.ProcessService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; diff --git a/src/main/java/neatlogic/module/process/importexport/handler/ScoreTemplateImportExportHandler.java b/src/main/java/neatlogic/module/process/importexport/handler/ScoreTemplateImportExportHandler.java index 9dd67733893f574d7f08ba1a51cc228894cec4ab..753258e1e7135604b1388c6c88d21df3d85a241a 100644 --- a/src/main/java/neatlogic/module/process/importexport/handler/ScoreTemplateImportExportHandler.java +++ b/src/main/java/neatlogic/module/process/importexport/handler/ScoreTemplateImportExportHandler.java @@ -6,7 +6,7 @@ import neatlogic.framework.importexport.dto.ImportExportBaseInfoVo; import neatlogic.framework.importexport.dto.ImportExportPrimaryChangeVo; import neatlogic.framework.importexport.dto.ImportExportVo; import neatlogic.framework.process.constvalue.ProcessImportExportHandlerType; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.score.ScoreTemplateVo; import neatlogic.framework.process.exception.score.ScoreTemplateNotFoundException; import neatlogic.module.process.service.ScoreTemplateService; diff --git a/src/main/java/neatlogic/module/process/importexport/handler/SubtaskPolicyImportExportHandler.java b/src/main/java/neatlogic/module/process/importexport/handler/SubtaskPolicyImportExportHandler.java index ce425f53fbe119a4acdb47f330d708ba8828ea93..3237ad812c50efd35b387327dfd991fb4360778e 100644 --- a/src/main/java/neatlogic/module/process/importexport/handler/SubtaskPolicyImportExportHandler.java +++ b/src/main/java/neatlogic/module/process/importexport/handler/SubtaskPolicyImportExportHandler.java @@ -7,7 +7,7 @@ import neatlogic.framework.importexport.dto.ImportExportBaseInfoVo; import neatlogic.framework.importexport.dto.ImportExportPrimaryChangeVo; import neatlogic.framework.importexport.dto.ImportExportVo; import neatlogic.framework.process.constvalue.ProcessImportExportHandlerType; -import neatlogic.framework.process.dao.mapper.task.TaskMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import neatlogic.framework.process.dto.TaskConfigVo; import neatlogic.framework.process.exception.processtask.task.TaskConfigNotFoundException; import org.springframework.stereotype.Component; diff --git a/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java b/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java index ce6044953bba8f0c0594b6cc115ee3586a9347da..1637ebce90e0754bd4b9ab01dbdb01b7e0f0fdb0 100644 --- a/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java +++ b/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java @@ -28,8 +28,8 @@ import neatlogic.framework.process.constvalue.AutoexecProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.automatic.FailPolicy; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.stephandler.core.IProcessStepHandler; diff --git a/src/main/java/neatlogic/module/process/job/source/handler/ItsmJobSourceHandler.java b/src/main/java/neatlogic/module/process/job/source/handler/ItsmJobSourceHandler.java index c5679166849d8ab5fa479c0fbf19e7f6d4355ce6..7629ee9673496a543c5135b1dce80f5598027e05 100644 --- a/src/main/java/neatlogic/module/process/job/source/handler/ItsmJobSourceHandler.java +++ b/src/main/java/neatlogic/module/process/job/source/handler/ItsmJobSourceHandler.java @@ -19,7 +19,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.autoexec.dto.job.AutoexecJobRouteVo; import neatlogic.framework.autoexec.source.IAutoexecJobSource; import neatlogic.framework.process.constvalue.AutoExecJobProcessSource; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import org.apache.commons.collections4.CollectionUtils; diff --git a/src/main/java/neatlogic/module/process/matrix/handler/PriorityMatrixPrivateDataSourceHandler.java b/src/main/java/neatlogic/module/process/matrix/handler/PriorityMatrixPrivateDataSourceHandler.java index 344bd8597a358c088e25df829f7d893852083892..6e553ff5a4f4db547d60f12f62a1f6edfbff2377 100644 --- a/src/main/java/neatlogic/module/process/matrix/handler/PriorityMatrixPrivateDataSourceHandler.java +++ b/src/main/java/neatlogic/module/process/matrix/handler/PriorityMatrixPrivateDataSourceHandler.java @@ -21,7 +21,7 @@ import neatlogic.framework.matrix.core.IMatrixPrivateDataSourceHandler; import neatlogic.framework.matrix.dto.MatrixAttributeVo; import neatlogic.framework.matrix.dto.MatrixDataVo; import neatlogic.framework.matrix.dto.MatrixFilterVo; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PrioritySearchVo; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.util.UuidUtil; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/ApprovalCommentListParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/ApprovalCommentListParamHandler.java index abe16156d080f35ba6befd3b4049baa518b082cc..f07cd028cd5ff8bf866ae37519af605ddc72c545 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/ApprovalCommentListParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/ApprovalCommentListParamHandler.java @@ -22,8 +22,8 @@ import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.*; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.notify.core.NotifyHandlerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/ChannelNameParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/ChannelNameParamHandler.java index 69d09990f76b224ca7d8466e98f551c0aba49fbd..1b21122817b05aad0df9115ca5ed3fd77469a680 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/ChannelNameParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/ChannelNameParamHandler.java @@ -16,8 +16,8 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/ChannelPathParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/ChannelPathParamHandler.java index f71d6ea6de9ededb5399b27697be77a29e76a673..305fb1a04633caf823f2e51e44865fbb6a20a164 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/ChannelPathParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/ChannelPathParamHandler.java @@ -16,9 +16,9 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/ChannelTypeNameParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/ChannelTypeNameParamHandler.java index 06868f084d8fca588e36692db2b6441c2eeeadfd..9bb09649744d409933fe8d481bea75a54e5c0024 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/ChannelTypeNameParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/ChannelTypeNameParamHandler.java @@ -16,9 +16,9 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/ContentParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/ContentParamHandler.java index 6efd7692c2c05feac9975a7e88f9992e8bb27f47..19bfab55edb0464b4b0b5b9ad9d1fa56c046fe2f 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/ContentParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/ContentParamHandler.java @@ -17,8 +17,8 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepBackContentParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepBackContentParamHandler.java index e984e3653ca852ed65175994ea6a58a3dd453009..4a51dcad1900146dc8698cce427e6044ac677155 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepBackContentParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepBackContentParamHandler.java @@ -17,8 +17,8 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java index 1226daf155aef688ebbc26d4edee4a68733d130e..64fb876a5899a0fdf753ebac6b3f1ec1b0f7383c 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java @@ -17,8 +17,8 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/DepartmentAndOwnerNameParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/DepartmentAndOwnerNameParamHandler.java index 8816a15c57b418b0df73b21b7d8bddb208aebd6e..548fcaa9708b5159dcd129a22d5d06c0bd9d6869 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/DepartmentAndOwnerNameParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/DepartmentAndOwnerNameParamHandler.java @@ -21,7 +21,7 @@ import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.TeamVo; import neatlogic.framework.dto.UserVo; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/EndTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/EndTimeParamHandler.java index f9a6818c8914db6b295a8ec197b1b9897f8653e8..e4381ce407d5ce389ff66c73e41ebeeeab81e287 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/EndTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/EndTimeParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/FormParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/FormParamHandler.java index f52697628eb6f8f8e0ade95cb75bde5151bc3397..8ed891a95758f18f5d7bb04653665cdb13cf4d35 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/FormParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/FormParamHandler.java @@ -24,8 +24,8 @@ import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.form.dto.FormVersionVo; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.notify.widget.FormTable; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskFormVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/OwnerCompanyListParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/OwnerCompanyListParamHandler.java index 0ddd150bcd879e0170f02502aab6e80585c92f31..079a6234cf7f0c691e0a0e4727acf0000dde52ce 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/OwnerCompanyListParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/OwnerCompanyListParamHandler.java @@ -19,7 +19,7 @@ import neatlogic.framework.common.constvalue.TeamLevel; import neatlogic.framework.dao.mapper.TeamMapper; import neatlogic.framework.dto.TeamVo; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/OwnerNameParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/OwnerNameParamHandler.java index b2435518ca64b966c6ea86934c81b506dabc78dc..5a5072bcb323beb82db8226fe5f5d465df4c4ab0 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/OwnerNameParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/OwnerNameParamHandler.java @@ -18,7 +18,7 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.UserVo; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/PriorityNameParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/PriorityNameParamHandler.java index 3a63cff7043c683654cb86dd31040bf16ad134f2..a6072689e4ae1ef61b216901324309e65676782f 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/PriorityNameParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/PriorityNameParamHandler.java @@ -16,8 +16,8 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.PriorityMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/ReporterNameParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/ReporterNameParamHandler.java index 5e89522be7d9549a79c756bdad04e97857734646..7d07e7f780e176ed4848bdb71374c98c5d7d301a 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/ReporterNameParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/ReporterNameParamHandler.java @@ -18,7 +18,7 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.UserVo; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/ScoreContentParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/ScoreContentParamHandler.java index 7232c8fcfe5ef9b7626e288d8937fb31bc727ea0..9a32cf0137ec5b7681aa8ed039db70079b07b866 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/ScoreContentParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/ScoreContentParamHandler.java @@ -15,20 +15,17 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; -import neatlogic.framework.dto.UrlInfoVo; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; -import neatlogic.framework.process.dao.mapper.score.ProcessTaskScoreMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.score.ProcessTaskScoreMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; -import neatlogic.framework.util.HtmlUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.util.List; @Component public class ScoreContentParamHandler extends ProcessTaskNotifyParamHandlerBase { diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/ScoreParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/ScoreParamHandler.java index 3c2d339d6f22c0a6e821a0f055fcc16c6ca15183..53878df628aed15b30505c6703ef9ff7a40b73b0 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/ScoreParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/ScoreParamHandler.java @@ -18,9 +18,9 @@ package neatlogic.module.process.notify.handler.param; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; -import neatlogic.framework.process.dao.mapper.score.ProcessTaskScoreMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.score.ProcessTaskScoreMapper; import neatlogic.framework.process.dto.ProcessTaskScoreTemplateVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.score.ProcessTaskScoreVo; @@ -34,7 +34,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/SerialNumberParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/SerialNumberParamHandler.java index 2885f6993a2a75779937d5339ad474640730ace7..3a2cb74979d1967c1b9aa20fb12f1be90e0dd9a7 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/SerialNumberParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/SerialNumberParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StartDateParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StartDateParamHandler.java index 90c2d4f02d319831fc86c57ff31ea742ba708200..8f692f8305401e951accddef98c1ab782cdc8921 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StartDateParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StartDateParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StartTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StartTimeParamHandler.java index ceac025dba87666b9ea1158c418061cb0afff4c9..15357b24ccf06d7c9d2e30ed901d8f6356c1ce91 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StartTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StartTimeParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StatusTextParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StatusTextParamHandler.java index 15a4d8d08811301066db775f0e1cba1ba00bee1f..27fb0d2a239ede36920c084493a18af2243aeed9 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StatusTextParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StatusTextParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStatusVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java index e369cd00b9c457db397f7604453f77b4aeb9afae..f1980893ed3534d9b651c1a2148dd6f9d00b4514 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepActiveTimeParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java index 64ee7711ba7977c1893cb3adb6d88658424c6377..589d37fddd4bd6233c7a1480e0b9dfc37ed9128a 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepCommentListParamHandler.java @@ -18,15 +18,14 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.*; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskContentVo; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; -import neatlogic.framework.util.HtmlUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java index aed8e431a34a507ead025e14d4df875c07c1bbfc..66bef42c0a61b85a654711e03e79168621583615 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepNameParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java index dd71bea23baf554a114ed131206bef8f16963ba5..4b6cdfec558e247e4a757193cd271a98ff1856ec 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepStartTimeParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java index 29fdf7d931432140d3fdfdc531cb6ae393fe6b6a..e6be521108d131bc3268d6d3a1062c17b5886d25 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepStayTimeParamHandler.java @@ -17,7 +17,7 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferContentParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferContentParamHandler.java index 0b34a350867a4651cf729fc510d4881815ba9c27..d4c2535baa59032bb28ac4b7db6f6706957b538f 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferContentParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferContentParamHandler.java @@ -15,17 +15,15 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; -import neatlogic.framework.dto.UrlInfoVo; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; -import neatlogic.framework.util.HtmlUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferWorkerParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferWorkerParamHandler.java index fd399a4df70d15c2761a294b9f2855e363222016..aacccddfeece982d8e98d59a397ce0b7d5f01531 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferWorkerParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferWorkerParamHandler.java @@ -25,7 +25,7 @@ import neatlogic.framework.dto.UserVo; import neatlogic.framework.dto.WorkAssignmentUnitVo; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java index abbfc533731112a5a385e407f571ddee3aab80ca..1038408bd073ceaf7cbcca9ba03140dbaef13837 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepWorkerParamHandler.java @@ -25,7 +25,7 @@ import neatlogic.framework.dto.UserVo; import neatlogic.framework.dto.WorkAssignmentUnitVo; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/TitleParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/TitleParamHandler.java index 795749028400d2e46112cef7a51fcf527e398f1a..c641dbf71ec823437ea9f52dc9056da085360f6b 100755 --- a/src/main/java/neatlogic/module/process/notify/handler/param/TitleParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/TitleParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/UrgeCountParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/UrgeCountParamHandler.java index 1161390025637d600190420760777c36a9d20124..5e06db3bf2b643b54d034b56437818577abfe2dd 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/UrgeCountParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/UrgeCountParamHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/UrgeUserParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/UrgeUserParamHandler.java index 1a4ad931196bbcbaeb0ecdeeefdbdd616d750a6d..f3a9ef8634ccb9a2a05260aaccca79c1237f27c1 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/UrgeUserParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/UrgeUserParamHandler.java @@ -18,7 +18,7 @@ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.UserVo; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java index 642105e837db067bb1819981c9b7334b9c348c34..5b7f6ce378876f6803bbaa0a4aeda85d36c0190c 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java @@ -6,9 +6,9 @@ import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESSTASK_MODIFY; import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.*; import neatlogic.framework.process.operationauth.core.OperationAuthHandlerBase; diff --git a/src/main/java/neatlogic/module/process/processtaskserialnumberpolicy/handler/AutoIncrementPolicy.java b/src/main/java/neatlogic/module/process/processtaskserialnumberpolicy/handler/AutoIncrementPolicy.java index bbda75269e13354a8b4135bb05fa1e524c328d36..3ff21596f5a1e8302f0347a648cad2bb9fed8dcc 100644 --- a/src/main/java/neatlogic/module/process/processtaskserialnumberpolicy/handler/AutoIncrementPolicy.java +++ b/src/main/java/neatlogic/module/process/processtaskserialnumberpolicy/handler/AutoIncrementPolicy.java @@ -1,9 +1,9 @@ package neatlogic.module.process.processtaskserialnumberpolicy.handler; import neatlogic.framework.common.util.PageUtil; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskSerialNumberMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ProcessTaskSerialNumberPolicyVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutoScoreJob.java b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutoScoreJob.java index 8d7dacc0c9a5af30c98561074a5ef71d596e9c8f..6791dc435084bf28fcb5f99eb50d3bd797f9bc24 100644 --- a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutoScoreJob.java +++ b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutoScoreJob.java @@ -21,9 +21,9 @@ import neatlogic.framework.asynchronization.threadlocal.TenantContext; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.score.ProcessTaskScoreMapper; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.score.ProcessTaskScoreMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.dto.score.ProcessTaskAutoScoreVo; import neatlogic.framework.process.dto.score.ProcessTaskScoreVo; diff --git a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutomaticJob.java b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutomaticJob.java index 159cad43e1fad784be396129b1550ffc2560ce72..cac3c0f650bbfdd1e395069b7b52065ee8875511 100644 --- a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutomaticJob.java +++ b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskAutomaticJob.java @@ -22,9 +22,9 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.process.constvalue.ProcessTaskStepDataType; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.automatic.AutomaticConfigVo; diff --git a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskSlaNotifyJob.java b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskSlaNotifyJob.java index 0b91a720a0dbf17999614ee34917c0bb8c31eeac..aa56a0a7b21652abaf5ddbb2e9d8be1c02a169ba 100644 --- a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskSlaNotifyJob.java +++ b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskSlaNotifyJob.java @@ -27,8 +27,8 @@ import neatlogic.framework.notify.dto.ParamMappingVo; import neatlogic.framework.process.condition.core.ProcessTaskConditionFactory; import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskSlaMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.scheduler.core.JobBase; import neatlogic.framework.scheduler.dto.JobObject; diff --git a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskSlaTransferJob.java b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskSlaTransferJob.java index bb9b4f5ea6f6cd622d2674492c3e751b9a52d1b4..b90e4efb7e15591fa60e06ec44fe082965b94bee 100644 --- a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskSlaTransferJob.java +++ b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskSlaTransferJob.java @@ -20,7 +20,7 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import neatlogic.framework.process.dao.mapper.ProcessTaskSlaMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -45,7 +45,7 @@ import neatlogic.framework.exception.role.RoleNotFoundException; import neatlogic.framework.exception.team.TeamNotFoundException; import neatlogic.framework.exception.user.UserNotFoundException; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskSlaTimeVo; import neatlogic.framework.process.dto.ProcessTaskSlaTransferVo; import neatlogic.framework.process.dto.ProcessTaskSlaVo; diff --git a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskStepTimerCompleteJob.java b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskStepTimerCompleteJob.java index 69a67d7c99135ac502f295084240706dd5378309..a557e4385157b06c944420e53dd556ae9438be62 100644 --- a/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskStepTimerCompleteJob.java +++ b/src/main/java/neatlogic/module/process/schedule/plugin/ProcessTaskStepTimerCompleteJob.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.schedule.plugin; import neatlogic.framework.asynchronization.threadlocal.TenantContext; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepTimerVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; diff --git a/src/main/java/neatlogic/module/process/service/CatalogServiceImpl.java b/src/main/java/neatlogic/module/process/service/CatalogServiceImpl.java index 155dedaa98e764c1281ce28f4f390c8faf46892c..6561a041df606a061d9fa283f0f67d31b78c1b3f 100644 --- a/src/main/java/neatlogic/module/process/service/CatalogServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/CatalogServiceImpl.java @@ -4,9 +4,9 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.DeviceType; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.crossover.ICatalogCrossoverService; -import neatlogic.framework.process.dao.mapper.CatalogMapper; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.CatalogVo; import neatlogic.framework.process.dto.ChannelRelationVo; import neatlogic.framework.process.dto.ChannelVo; diff --git a/src/main/java/neatlogic/module/process/service/ChannelService.java b/src/main/java/neatlogic/module/process/service/ChannelService.java new file mode 100644 index 0000000000000000000000000000000000000000..84989c2be09f8c822dc49265215be020ab1df2fd --- /dev/null +++ b/src/main/java/neatlogic/module/process/service/ChannelService.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.service; + +import neatlogic.framework.process.dto.ChannelVo; + +public interface ChannelService { + + String saveChannel(ChannelVo channelVo); + +} diff --git a/src/main/java/neatlogic/module/process/service/ChannelServiceImpl.java b/src/main/java/neatlogic/module/process/service/ChannelServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..ca74d77ddc3759fc7ce77f075c896f259f726e4f --- /dev/null +++ b/src/main/java/neatlogic/module/process/service/ChannelServiceImpl.java @@ -0,0 +1,166 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.service; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.crossover.CrossoverServiceFactory; +import neatlogic.framework.dto.AuthorityVo; +import neatlogic.framework.process.crossover.IProcessCrossoverMapper; +import neatlogic.framework.process.dto.CatalogVo; +import neatlogic.framework.process.dto.ChannelPriorityVo; +import neatlogic.framework.process.dto.ChannelRelationVo; +import neatlogic.framework.process.dto.ChannelVo; +import neatlogic.framework.process.exception.catalog.CatalogNotFoundException; +import neatlogic.framework.process.exception.channel.ChannelNameRepeatException; +import neatlogic.framework.process.exception.channel.ChannelParentUuidCannotBeZeroException; +import neatlogic.framework.process.exception.channel.ChannelRelationSettingException; +import neatlogic.framework.process.exception.priority.PriorityNotFoundException; +import neatlogic.framework.process.exception.process.ProcessNotFoundException; +import neatlogic.framework.worktime.dao.mapper.WorktimeMapper; +import neatlogic.framework.worktime.exception.WorktimeNotFoundException; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Objects; + +@Service +public class ChannelServiceImpl implements ChannelService { + + private final static Logger logger = LoggerFactory.getLogger(ChannelServiceImpl.class); + + @Resource + private ChannelMapper channelMapper; + + @Resource + private CatalogMapper catalogMapper; + + @Resource + private PriorityMapper priorityMapper; + + @Resource + private WorktimeMapper worktimeMapper; + + @Override + public String saveChannel(ChannelVo channelVo) { + String parentUuid = channelVo.getParentUuid(); + if (CatalogVo.ROOT_UUID.equals(parentUuid)) { + throw new ChannelParentUuidCannotBeZeroException(); + } + if (catalogMapper.checkCatalogIsExists(parentUuid) == 0) { + throw new CatalogNotFoundException(parentUuid); + } + if (channelMapper.checkChannelNameIsRepeat(channelVo) > 0) { + throw new ChannelNameRepeatException(channelVo.getName()); + } + int sort; + String uuid = channelVo.getUuid(); + ChannelVo existedChannel = channelMapper.getChannelByUuid(uuid); + if (existedChannel == null) {//新增 + channelVo.setUuid(null); + uuid = channelVo.getUuid(); + sort = channelMapper.getMaxSortByParentUuid(parentUuid) + 1; + } else {//修改 + channelMapper.deleteChannelPriorityByChannelUuid(uuid); + channelMapper.deleteChannelAuthorityByChannelUuid(uuid); + sort = existedChannel.getSort(); + } + channelVo.setSort(sort); + channelMapper.replaceChannel(channelVo); + IProcessCrossoverMapper processCrossoverMapper = CrossoverServiceFactory.getApi(IProcessCrossoverMapper.class); + if (processCrossoverMapper.checkProcessIsExists(channelVo.getProcessUuid()) == 0) { + throw new ProcessNotFoundException(channelVo.getProcessUuid()); + } + channelMapper.replaceChannelProcess(uuid, channelVo.getProcessUuid()); + + if (worktimeMapper.checkWorktimeIsExists(channelVo.getWorktimeUuid()) == 0) { + throw new WorktimeNotFoundException(channelVo.getWorktimeUuid()); + } + channelMapper.replaceChannelWorktime(uuid, channelVo.getWorktimeUuid()); + //优先级 + if(channelVo.getIsNeedPriority() == 1) { + String defaultPriorityUuid = channelVo.getDefaultPriorityUuid(); + List priorityUuidList = channelVo.getPriorityUuidList(); + for (String priorityUuid : priorityUuidList) { + if (priorityMapper.checkPriorityIsExists(priorityUuid) == 0) { + throw new PriorityNotFoundException(priorityUuid); + } + ChannelPriorityVo channelPriority = new ChannelPriorityVo(); + channelPriority.setChannelUuid(uuid); + channelPriority.setPriorityUuid(priorityUuid); + if (defaultPriorityUuid.equals(priorityUuid)) { + channelPriority.setIsDefault(1); + } else { + channelPriority.setIsDefault(0); + } + channelMapper.insertChannelPriority(channelPriority); + } + } + List authorityList = channelVo.getAuthorityVoList(); + if (CollectionUtils.isNotEmpty(authorityList)) { + for (AuthorityVo authorityVo : authorityList) { + channelMapper.insertChannelAuthority(authorityVo, channelVo.getUuid()); + } + } + /** 转报设置逻辑，允许转报后，转报设置必填 **/ + channelMapper.deleteChannelRelationBySource(channelVo.getUuid()); + channelMapper.deleteChannelRelationAuthorityBySource(channelVo.getUuid()); + channelMapper.deleteChannelRelationIsUsePreOwnerBySource(channelVo.getUuid()); + JSONObject config = channelVo.getConfig(); + if (MapUtils.isNotEmpty(config)) { + Integer allowTranferReport = config.getInteger("allowTranferReport"); + if (Objects.equals(allowTranferReport, 1)) { + JSONArray channelRelationArray = config.getJSONArray("channelRelationList"); + if (CollectionUtils.isEmpty(channelRelationArray)) { + throw new ChannelRelationSettingException(); + } + List channelRelationList = channelRelationArray.toJavaList(ChannelRelationVo.class); + for (ChannelRelationVo channelRelationVo : channelRelationList) { + channelRelationVo.setSource(channelVo.getUuid()); + channelMapper.insertChannelRelationIsUsePreOwner(channelRelationVo); + for (String typeAndtarget : channelRelationVo.getTargetList()) { + if (typeAndtarget.contains("#")) { + String[] split = typeAndtarget.split("#"); + channelRelationVo.setType(split[0]); + channelRelationVo.setTarget(split[1]); + channelMapper.insertChannelRelation(channelRelationVo); + } + } + for (String authority : channelRelationVo.getAuthorityList()) { + if (authority.contains("#")) { + String[] split = authority.split("#"); + channelRelationVo.setType(split[0]); + channelRelationVo.setUuid(split[1]); + channelMapper.insertChannelRelationAuthority(channelRelationVo); + } + + } + } + } + } + return channelVo.getUuid(); + } +} diff --git a/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java new file mode 100644 index 0000000000000000000000000000000000000000..a35ee0cb0f0dfa8217b2c2dcc8f904fc1b82b421 --- /dev/null +++ b/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java @@ -0,0 +1,182 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package neatlogic.module.process.service; + +import neatlogic.framework.notify.core.INotifyTriggerType; +import neatlogic.framework.process.audithandler.core.IProcessTaskAuditType; +import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.dto.ProcessTaskVo; +import neatlogic.framework.process.stepremind.core.IProcessTaskStepRemindType; + +import java.util.List; + +public interface IProcessStepHandlerUtil { + /** + * @Description: 触发动作 + * @Author: linbq + * @Date: 2021/1/20 16:15 + * @Params:[currentProcessTaskStepVo, trigger] + * @Returns:void + **/ + void action(ProcessTaskStepVo currentProcessTaskStepVo, INotifyTriggerType trigger); + + /** + * @Description: 触发通知 + * @Author: linbq + * @Date: 2021/1/20 16:17 + * @Params:[currentProcessTaskStepVo, trigger] + * @Returns:void + **/ + void notify(ProcessTaskStepVo currentProcessTaskStepVo, INotifyTriggerType trigger); + + /** + * @Description: 计算时效 + * @Author: linbq + * @Date: 2021/1/20 16:17 + * @Params:[currentProcessTaskVo, isAsync] + * @Returns:void + **/ + void calculateSla(ProcessTaskVo currentProcessTaskVo, boolean isAsync); + + /** + * @Description: 计算时效 + * @Author: linbq + * @Date: 2021/1/20 16:17 + * @Params:[currentProcessTaskVo, isAsync] + * @Returns:void + **/ + void calculateSla(ProcessTaskVo currentProcessTaskVo); + + /** + * @Description: 计算时效 + * @Author: linbq + * @Date: 2021/1/20 16:17 + * @Params:[currentProcessTaskVo, isAsync] + * @Returns:void + **/ + void calculateSla(ProcessTaskStepVo currentProcessTaskStepVo); + + /** + * @Description: 记录操作时间 + * @Author: linbq + * @Date: 2021/1/20 16:19 + * @Params:[currentProcessTaskStepVo, action] + * @Returns:void + **/ + void timeAudit(ProcessTaskStepVo currentProcessTaskStepVo, ProcessTaskOperationType action); + + /** + * @Description: 记录操作活动 + * @Author: linbq + * @Date: 2021/1/20 16:19 + * @Params:[currentProcessTaskStepVo, action] + * @Returns:void + **/ + void audit(ProcessTaskStepVo currentProcessTaskStepVo, IProcessTaskAuditType action); + + /** + * @Description: 自动评分 + * @Author: linbq + * @Date: 2021/1/20 16:22 + * @Params:[currentProcessTaskVo] + * @Returns:void + **/ + void autoScore(ProcessTaskVo currentProcessTaskVo); + + /** + * @Description: 获取验证基本信息数据是否合法，并验证 + * @Author: linbq + * @Date: 2021/1/20 16:21 + * @Params:[currentProcessTaskStepVo] + * @Returns:boolean + **/ + boolean baseInfoValidFromDb(ProcessTaskStepVo currentProcessTaskStepVo); + + /** + * @Description: 验证前置步骤指派处理人是否合法 + * @Author: linbq + * @Date: 2021/1/20 16:21 + * @Params:[currentProcessTaskStepVo] + * @Returns:boolean + **/ + boolean assignWorkerValid(ProcessTaskStepVo currentProcessTaskStepVo); + + /** + * 找出流转到哪些步骤时，需要指定targetStepId步骤的处理人 + * @param processTaskId 工单id + * @param currentStepId 当前流转步骤id + * @param targetStepId 配置了由当前步骤处理人指定处理人的步骤id + * @return + */ + List getNextStepIdList(Long processTaskId, Long currentStepId, Long targetStepId); + + /** + * @Description: 保存步骤提醒 + * @Author: linbq + * @Date: 2021/1/21 11:30 + * @Params:[currentProcessTaskStepVo, targerProcessTaskStepId, reason, ation] + * @Returns:int + **/ + int saveStepRemind(ProcessTaskStepVo currentProcessTaskStepVo, Long targerProcessTaskStepId, String reason, IProcessTaskStepRemindType ation); + + /** + * @Description: 保存描述内容和附件 + * @Author: linbq + * @Date: 2021/1/27 11:41 + * @Params:[currentProcessTaskStepVo, action] + * @Returns:void + **/ + void saveContentAndFile(ProcessTaskStepVo currentProcessTaskStepVo, ProcessTaskOperationType action); + + /** + * 保存工单级别的操作描述内容 + * @param currentProcessTaskVo + * @param action + */ + void saveProcessTaskOperationContent(ProcessTaskVo currentProcessTaskVo, ProcessTaskOperationType action); + + /** + * 流转操作时检查回复信息是否必填 + * @param currentProcessTaskStepVo + */ + void checkContentIsRequired(ProcessTaskStepVo currentProcessTaskStepVo); + + /** + * @Description: 保存标签列表 + * @Author: linbq + * @Date: 2021/1/27 11:42 + * @Params:[currentProcessTaskStepVo] + * @Returns:void + **/ + void saveTagList(ProcessTaskStepVo currentProcessTaskStepVo); + + /** + * @Description: 保存工单关注人 + * @Author: laiwt + * @Date: 2021/2/19 11:20 + * @Params: [currentProcessTaskStepVo] + * @Returns: void + **/ + void saveFocusUserList(ProcessTaskStepVo currentProcessTaskStepVo); + + /** + * 保存表单属性值 + * @param currentProcessTaskStepVo 当前步骤信息 + */ + void saveForm(ProcessTaskStepVo currentProcessTaskStepVo); +} diff --git a/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java b/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java index 22cc05814da3bfbaadfdda1fe5ac4839c413b05a..9fa4961d797bb89acf76317ba9978b63a0c635d3 100644 --- a/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java @@ -34,10 +34,10 @@ import neatlogic.framework.process.auth.PROCESSTASK_MODIFY; import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnFactory; import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTaskMapper; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.process.stephandler.core.IProcessStepHandler; diff --git a/src/main/java/neatlogic/module/process/service/ProcessCommentTemplateServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessCommentTemplateServiceImpl.java index e3d55c582f7518eb4b05fdc2312f0a6b27925555..22245ebb5d59871b989eb08eabb8af754ea0539e 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessCommentTemplateServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessCommentTemplateServiceImpl.java @@ -2,7 +2,7 @@ package neatlogic.module.process.service; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.GroupSearch; -import neatlogic.framework.process.dao.mapper.ProcessCommentTemplateMapper; +import neatlogic.module.process.dao.mapper.process.ProcessCommentTemplateMapper; import neatlogic.framework.process.dto.ProcessCommentTemplateAuthVo; import neatlogic.framework.process.dto.ProcessCommentTemplateVo; import neatlogic.framework.process.exception.commenttemplate.ProcessCommentTemplateNameRepeatException; diff --git a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java index ab214204928b9a2d47a4718b6081b3f36af0b94d..6c1f9a2ca4024cfe662934cdf452939e5e45a718 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java @@ -26,15 +26,15 @@ import neatlogic.framework.integration.dao.mapper.IntegrationMapper; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dao.mapper.NotifyMapper; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; -import neatlogic.framework.process.dao.mapper.ProcessTagMapper; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.process.ProcessTagMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.process.ProcessNameRepeatException; import neatlogic.framework.process.exception.sla.SlaCalculateHandlerNotFoundException; import neatlogic.framework.process.sla.core.ISlaCalculateHandler; import neatlogic.framework.process.sla.core.SlaCalculateHandlerFactory; import neatlogic.framework.util.UuidUtil; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.dependency.handler.*; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java similarity index 97% rename from src/main/java/neatlogic/module/process/stephandler/utilhandler/ProcessStepHandlerUtil.java rename to src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index ca51047b7cb68d8a76a014a0384c7265cbe2e405..1b372906647ef32b57856b1571f5bd218509dae5 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -1,26 +1,27 @@ -/*Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see .*/ - -package neatlogic.module.process.stephandler.utilhandler; +package neatlogic.module.process.service; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.asynchronization.threadpool.TransactionSynchronizationPool; -import neatlogic.framework.common.RootComponent; import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.exception.user.UserNotFoundException; @@ -32,26 +33,31 @@ import neatlogic.framework.form.exception.FormAttributeRequiredException; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.audithandler.core.IProcessTaskAuditType; import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.dao.mapper.*; +import neatlogic.framework.process.crossover.IProcessStepHandlerCrossoverUtil; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.processtask.*; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; import neatlogic.framework.process.stepremind.core.IProcessTaskStepRemindType; import neatlogic.framework.process.workerpolicy.core.IWorkerPolicyHandler; import neatlogic.framework.process.workerpolicy.core.WorkerPolicyHandlerFactory; import neatlogic.framework.util.FormUtil; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.process.ProcessTagMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTimeAuditMapper; import neatlogic.module.process.thread.*; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -@RootComponent -public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil { +@Service +public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcessStepHandlerCrossoverUtil { @Resource private ProcessTaskStepTimeAuditMapper processTaskStepTimeAuditMapper; @Resource @@ -128,8 +134,7 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil { * @Date: 2021/1/20 16:17 * @Returns:void */ - @Override - public void calculateSla(ProcessTaskVo currentProcessTaskVo, ProcessTaskStepVo currentProcessTaskStepVo, boolean isAsync) { + private void calculateSla(ProcessTaskVo currentProcessTaskVo, ProcessTaskStepVo currentProcessTaskStepVo, boolean isAsync) { if (!isAsync) { new ProcessTaskSlaThread(currentProcessTaskVo, currentProcessTaskStepVo).execute(); } else { @@ -262,8 +267,7 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil { * @Author: linbq * @Date: 2021/1/20 16:21 */ - @Override - public boolean baseInfoValid(ProcessTaskStepVo currentProcessTaskStepVo, ProcessTaskVo processTaskVo) { + private boolean baseInfoValid(ProcessTaskStepVo currentProcessTaskStepVo, ProcessTaskVo processTaskVo) { JSONObject paramObj = currentProcessTaskStepVo.getParamObj(); if (processTaskVo.getTitle() == null) { throw new ProcessTaskTitleIsEmptyException(); diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskAgentService.java b/src/main/java/neatlogic/module/process/service/ProcessTaskAgentService.java new file mode 100644 index 0000000000000000000000000000000000000000..e6a954d4404bd9e835219b216c9d56419828b334 --- /dev/null +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskAgentService.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.service; + +import java.util.List; + +/** + * @author linbq + * @since 2021/10/11 15:50 + **/ +public interface ProcessTaskAgentService { + + List getFromUserUuidListByToUserUuidAndChannelUuid(String toUserUuid, String channelUuid); + + List getChannelUuidListByProcessTaskAgentId(Long processTaskAgentId); +} diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskAgentServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskAgentServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..1dbbf63a66eec60aee9086c54162f0503dba9733 --- /dev/null +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskAgentServiceImpl.java @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.process.service; + +import neatlogic.framework.process.crossover.IProcessTaskAgentCrossoverService; +import neatlogic.framework.process.dto.CatalogVo; +import neatlogic.framework.process.dto.ChannelVo; +import neatlogic.framework.process.dto.agent.ProcessTaskAgentTargetVo; +import neatlogic.framework.process.dto.agent.ProcessTaskAgentVo; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskAgentMapper; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * @author linbq + * @since 2021/10/11 15:51 + **/ +@Service +public class ProcessTaskAgentServiceImpl implements ProcessTaskAgentService, IProcessTaskAgentCrossoverService { + + @Resource + private ProcessTaskAgentMapper processTaskAgentMapper; + @Resource + private ChannelMapper channelMapper; + @Resource + private CatalogMapper catalogMapper; + + @Override + public List getFromUserUuidListByToUserUuidAndChannelUuid(String toUserUuid, String channelUuid) { + List fromUserUuidList = new ArrayList<>(); + List processTaskAgentList = processTaskAgentMapper.getProcessTaskAgentDetailListByToUserUuid(toUserUuid); + for (ProcessTaskAgentVo processTaskAgentVo : processTaskAgentList) { + String fromUserUuid = processTaskAgentVo.getFromUserUuid(); + if (fromUserUuidList.contains(fromUserUuid)) { + continue; + } + boolean flag = false; + List catalogUuidList = new ArrayList<>(); + List processTaskAgentTargetList = processTaskAgentVo.getProcessTaskAgentTargetVos(); + for (ProcessTaskAgentTargetVo processTaskAgentTargetVo : processTaskAgentTargetList) { + String type = processTaskAgentTargetVo.getType(); + if ("channel".equals(type)) { + if (channelUuid.equals(processTaskAgentTargetVo.getTarget())) { + flag = true; + break; + } + } else if ("catalog".equals(type)) { + catalogUuidList.add(processTaskAgentTargetVo.getTarget()); + } + } + if (!flag && CollectionUtils.isNotEmpty(catalogUuidList)) { + ChannelVo channelVo = channelMapper.getChannelByUuid(channelUuid); + CatalogVo catalogVo = catalogMapper.getCatalogByUuid(channelVo.getParentUuid()); + List upwardUuidList = catalogMapper.getUpwardUuidListByLftRht(catalogVo.getLft(), catalogVo.getRht()); + flag = catalogUuidList.removeAll(upwardUuidList); + } + if (flag) { + fromUserUuidList.add(fromUserUuid); + } + } + return fromUserUuidList; + } + + @Override + public List getChannelUuidListByProcessTaskAgentId(Long processTaskAgentId) { + List resultList = new ArrayList<>(); + Set catalogUuidList = new HashSet<>(); + List processTaskAgentTargetList = processTaskAgentMapper.getProcessTaskAgentTargetListByProcessTaskAgentId(processTaskAgentId); + for (ProcessTaskAgentTargetVo processTaskAgentTargetVo : processTaskAgentTargetList) { + String type = processTaskAgentTargetVo.getType(); + if ("channel".equals(type)) { + if (channelMapper.checkChannelIsExists(processTaskAgentTargetVo.getTarget()) > 0) { + resultList.add(processTaskAgentTargetVo.getTarget()); + } + } else if ("catalog".equals(type)) { + CatalogVo catalogVo = catalogMapper.getCatalogByUuid(processTaskAgentTargetVo.getTarget()); + if (catalogVo != null) { + List downwardUuidList = catalogMapper.getDownwardUuidListByLftRht(catalogVo.getLft(), catalogVo.getRht()); + catalogUuidList.addAll(downwardUuidList); + } + } + } + if (CollectionUtils.isNotEmpty(catalogUuidList)) { + List channelUuidList = channelMapper.getChannelUuidListByParentUuidList(new ArrayList<>(catalogUuidList)); + if (CollectionUtils.isNotEmpty(channelUuidList)) { + channelUuidList.removeAll(resultList); + resultList.addAll(channelUuidList); + } + } + return resultList; + } +} diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java index a9a25539376b59cc04d32ec48c8c900a64dda28a..6ae9334625e1e6199e5448691fcc47b224067438 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java @@ -30,9 +30,9 @@ import neatlogic.framework.process.condition.core.ProcessTaskConditionFactory; import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.constvalue.automatic.CallbackType; import neatlogic.framework.process.constvalue.automatic.FailPolicy; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; @@ -41,7 +41,6 @@ import neatlogic.framework.process.dto.automatic.ProcessTaskStepAutomaticRequest import neatlogic.framework.process.handler.ProcessRequestFrom; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepAutomaticNotifyTriggerType; import neatlogic.framework.process.stephandler.core.IProcessStepHandler; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; import neatlogic.framework.scheduler.core.IJob; import neatlogic.framework.scheduler.core.SchedulerManager; diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java index 68985c77c58dcf05dd3f1b85665e54f715fffe2b..662f0707e1597bcc6bc3ba2aeca5d2a990a3e2ba 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java @@ -25,9 +25,9 @@ import neatlogic.framework.form.exception.FormAttributeHandlerNotFoundException; import neatlogic.framework.form.exception.FormAttributeNotFoundException; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.crossover.IProcessTaskCreatePublicCrossoverService; -import neatlogic.framework.process.dao.mapper.ChannelMapper; -import neatlogic.framework.process.dao.mapper.PriorityMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.process.dto.ProcessFormVo; @@ -38,7 +38,7 @@ import neatlogic.framework.process.exception.processtask.ProcessTaskNextStepIlle import neatlogic.framework.process.exception.processtask.ProcessTaskNextStepOverOneException; import neatlogic.framework.service.AuthenticationInfoService; import neatlogic.framework.util.SnowflakeUtil; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskSerialNumberServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskSerialNumberServiceImpl.java index ee415fdd805e5b1d75727fe49ab1cf5085336f86..2f2874d57da8ae27cf2db604754dee6863127747 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskSerialNumberServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskSerialNumberServiceImpl.java @@ -17,9 +17,9 @@ package neatlogic.module.process.service; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.common.util.PageUtil; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskSerialNumberMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ProcessTaskSerialNumberPolicyVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index e47c578045226cbbf7b87ab09fcea996fa3845c9..20eaaff420dc3d3516d14c781b735d5e151d786a 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -49,7 +49,6 @@ import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnFactory; import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.crossover.IProcessTaskCrossoverService; -import neatlogic.framework.process.dao.mapper.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.channel.ChannelNotFoundException; import neatlogic.framework.process.exception.file.ProcessTaskFileDownloadException; @@ -62,7 +61,6 @@ import neatlogic.framework.process.exception.processtask.task.ProcessTaskStepTas import neatlogic.framework.process.fulltextindex.ProcessFullTextIndexType; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepTaskNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.service.ProcessTaskAgentService; import neatlogic.framework.process.stephandler.core.*; import neatlogic.framework.process.stepremind.core.ProcessTaskStepRemindTypeFactory; import neatlogic.framework.process.task.TaskConfigManager; @@ -73,7 +71,19 @@ import neatlogic.framework.util.$; import neatlogic.framework.util.FormUtil; import neatlogic.framework.util.TimeUtil; import neatlogic.framework.worktime.dao.mapper.WorktimeMapper; -import neatlogic.module.process.dao.mapper.ProcessMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.process.ProcessCommentTemplateMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import neatlogic.module.process.dao.mapper.process.ProcessStepHandlerMapper; +import neatlogic.module.process.dao.mapper.process.ProcessTagMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java index d6aaab615ef747b7eab61525d81d65d771fe95ed..0f6eca5fc7523916448a1ab47a318443515c6a19 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java @@ -22,10 +22,10 @@ import neatlogic.framework.dto.UserVo; import neatlogic.framework.file.dao.mapper.FileMapper; import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; -import neatlogic.framework.process.dao.mapper.task.TaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskHiddenException; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; @@ -34,8 +34,6 @@ import neatlogic.framework.process.exception.operationauth.ProcessTaskStepNotMin import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.process.exception.processtask.task.*; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepTaskNotifyTriggerType; -import neatlogic.framework.process.service.ProcessTaskAgentServiceImpl; -import neatlogic.framework.process.stephandler.core.IProcessStepHandlerUtil; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; import neatlogic.framework.process.task.TaskConfigManager; @@ -72,7 +70,7 @@ public class ProcessTaskStepTaskServiceImpl implements ProcessTaskStepTaskServic @Resource TaskMapper taskMapper; @Resource - private IProcessStepHandlerUtil IProcessStepHandlerUtil; + private IProcessStepHandlerUtil processStepHandlerUtil; @Resource TaskConfigManager taskConfigManager; @Resource @@ -146,9 +144,9 @@ public class ProcessTaskStepTaskServiceImpl implements ProcessTaskStepTaskServic processTaskStepTaskVo.setTaskConfigName(taskConfigVo.getName()); processTaskStepVo.setProcessTaskStepTaskVo(processTaskStepTaskVo); processTaskStepTaskVo.setStepTaskUserVoList(processTaskStepTaskMapper.getStepTaskUserByStepTaskIdList(Collections.singletonList(processTaskStepTaskVo.getId()))); - IProcessStepHandlerUtil.audit(processTaskStepVo, auditType); - IProcessStepHandlerUtil.notify(processTaskStepVo, triggerType); - IProcessStepHandlerUtil.action(processTaskStepVo, triggerType); + processStepHandlerUtil.audit(processTaskStepVo, auditType); + processStepHandlerUtil.notify(processTaskStepVo, triggerType); + processStepHandlerUtil.action(processTaskStepVo, triggerType); } // /** @@ -359,12 +357,12 @@ public class ProcessTaskStepTaskServiceImpl implements ProcessTaskStepTaskServic } } if (isCanStepComplete) { - IProcessStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.COMPLETEALLTASK); + processStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.COMPLETEALLTASK); } } - IProcessStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.COMPLETETASK); - IProcessStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.COMPLETETASK); - IProcessStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.COMPLETETASK); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.COMPLETETASK); + processStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.COMPLETETASK); + processStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepTaskNotifyTriggerType.COMPLETETASK); IProcessStepInternalHandler handler = ProcessStepInternalHandlerFactory.getHandler(processTaskStepVo.getHandler()); if (handler == null) { diff --git a/src/main/java/neatlogic/module/process/service/ScoreTemplateServiceImpl.java b/src/main/java/neatlogic/module/process/service/ScoreTemplateServiceImpl.java index e8ebbf5b7dbdab6c30a7618cb5c94051d3f9bd62..9e3c82233d460484cd5142546470f76e1bf57aa2 100644 --- a/src/main/java/neatlogic/module/process/service/ScoreTemplateServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ScoreTemplateServiceImpl.java @@ -1,7 +1,7 @@ package neatlogic.module.process.service; import neatlogic.framework.asynchronization.threadlocal.UserContext; -import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.framework.process.dto.score.ScoreTemplateDimensionVo; import neatlogic.framework.process.dto.score.ScoreTemplateVo; import org.springframework.stereotype.Service; diff --git a/src/main/java/neatlogic/module/process/sla/handler/ItsmSlaRecalculateHandler.java b/src/main/java/neatlogic/module/process/sla/handler/ItsmSlaRecalculateHandler.java index 0b937d0c40f2e38a00fd7ddccae181584d8a7fb8..16d0928a3dc423d7966530cb10007cbef24e6aa3 100644 --- a/src/main/java/neatlogic/module/process/sla/handler/ItsmSlaRecalculateHandler.java +++ b/src/main/java/neatlogic/module/process/sla/handler/ItsmSlaRecalculateHandler.java @@ -18,7 +18,7 @@ package neatlogic.module.process.sla.handler; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.process.constvalue.SlaStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskSlaMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import neatlogic.framework.process.dto.ProcessTaskSlaTimeCostVo; import neatlogic.framework.process.dto.ProcessTaskSlaTimeVo; import neatlogic.framework.process.dto.ProcessTaskSlaVo; diff --git a/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java b/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java index a44594d69cdefeb2396d5c24b320092d3148d0d5..7b6bd21c2d1af1e28dfe50386ab1f0d89d277a92 100644 --- a/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java +++ b/src/main/java/neatlogic/module/process/sla/service/ProcessTaskSlaServiceImpl.java @@ -18,7 +18,7 @@ package neatlogic.module.process.sla.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.TenantContext; -import neatlogic.framework.process.dao.mapper.ProcessTaskSlaMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import neatlogic.framework.process.dto.ProcessTaskSlaNotifyVo; import neatlogic.framework.process.dto.ProcessTaskSlaTimeCostVo; import neatlogic.framework.process.dto.ProcessTaskSlaTimeVo; diff --git a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java index 70ca8ba0cbb8e6bdd1b312bd5f934142f6fecd50..60ba34fc4e2fc721216a30909a543ddb44579391 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java @@ -22,7 +22,6 @@ import neatlogic.framework.asynchronization.threadpool.TransactionSynchronizatio import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.constvalue.automatic.FailPolicy; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepInOperationVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -39,7 +38,10 @@ import neatlogic.framework.scheduler.core.SchedulerManager; import neatlogic.framework.scheduler.dto.JobObject; import neatlogic.framework.scheduler.exception.ScheduleHandlerNotFoundException; import neatlogic.framework.util.TimeUtil; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; import neatlogic.module.process.schedule.plugin.ProcessTaskAutomaticJob; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.module.process.service.ProcessTaskAutomaticService; import neatlogic.module.process.thread.ProcessTaskAutomaticThread; import org.apache.commons.collections4.MapUtils; @@ -65,6 +67,11 @@ public class AutomaticProcessComponent extends ProcessStepHandlerBase { @Resource ProcessTaskAutomaticService processTaskAutomaticService; + @Resource + private ProcessTaskMapper processTaskMapper; + + @Resource + private IProcessStepHandlerUtil processStepHandlerUtil; @Override public String getHandler() { @@ -325,7 +332,7 @@ public class AutomaticProcessComponent extends ProcessStepHandlerBase { } /** 处理历史记录 **/ String action = currentProcessTaskStepVo.getParamObj().getString("action"); - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.getProcessTaskAuditType(action)); + processStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.getProcessTaskAuditType(action)); return 0; } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java index 74ca154da963d61b0d86065163888bc8d6a95474..d8884fdf3771e5139b6342171fe46a9d34a1a477 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java @@ -32,12 +32,16 @@ import neatlogic.framework.process.exception.processtask.ProcessTaskException; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerBase; import neatlogic.framework.util.RunScriptUtil; import neatlogic.framework.util.javascript.JavascriptUtil; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import javax.script.Invocable; import javax.script.ScriptEngine; import java.util.*; @@ -49,6 +53,15 @@ import java.util.stream.Collectors; public class ConditionProcessComponent extends ProcessStepHandlerBase { static Logger logger = LoggerFactory.getLogger(ConditionProcessComponent.class); + @Resource + private ProcessTaskMapper processTaskMapper; + + @Resource + private SelectContentByHashMapper selectContentByHashMapper; + + @Resource + private IProcessStepHandlerUtil processStepHandlerUtil; + @Override public String getName() { return ProcessStepHandlerType.CONDITION.getName(); @@ -202,7 +215,7 @@ public class ConditionProcessComponent extends ProcessStepHandlerBase { /* 处理历史记录 **/ // String action = currentProcessTaskStepVo.getParamObj().getString("action"); // AuditHandler.audit(currentProcessTaskStepVo, ProcessTaskAuditType.getProcessTaskAuditType(action)); - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.CONDITION); + processStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.CONDITION); return 1; } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java index 9174e06b1b5b646effe22bd457db385cff8b521b..ec2130d05537321b803b5871ed4a30ee05758933 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/EndProcessComponent.java @@ -1,5 +1,6 @@ package neatlogic.module.process.stephandler.component; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessStepMode; import neatlogic.framework.process.constvalue.ProcessTaskStatus; @@ -8,15 +9,19 @@ import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.processtask.ProcessTaskException; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerBase; -import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; import java.util.Set; @Service public class EndProcessComponent extends ProcessStepHandlerBase { + @Resource + private IProcessStepHandlerUtil processStepHandlerUtil; + @Override public String getHandler() { return ProcessStepHandlerType.END.getHandler(); @@ -106,7 +111,7 @@ public class EndProcessComponent extends ProcessStepHandlerBase { processTaskVo.setId(currentProcessTaskStepVo.getProcessTaskId()); // processTaskMapper.updateProcessTaskStatus(processTaskVo); //自动评分 - IProcessStepHandlerUtil.autoScore(processTaskVo); + processStepHandlerUtil.autoScore(processTaskVo); return 0; } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/OmnipotentProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/OmnipotentProcessComponent.java index c9ff1f4c3cadb23cda67e6a9ba3a6090b636d165..8e60cb5ce5070e095bfedfea7b7e03a066875626 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/OmnipotentProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/OmnipotentProcessComponent.java @@ -1,5 +1,7 @@ package neatlogic.module.process.stephandler.component; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONPath; import neatlogic.framework.process.autocompleterule.core.AutoCompleteRuleHandlerFactory; import neatlogic.framework.process.autocompleterule.core.IAutoCompleteRuleHandler; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; @@ -10,13 +12,14 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; import neatlogic.framework.process.exception.processtask.ProcessTaskException; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerBase; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONPath; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; import java.util.Objects; import java.util.Set; @@ -25,6 +28,12 @@ import java.util.Set; public class OmnipotentProcessComponent extends ProcessStepHandlerBase { static Logger logger = LoggerFactory.getLogger(OmnipotentProcessComponent.class); + @Resource + private SelectContentByHashMapper selectContentByHashMapper; + + @Resource + private IProcessStepHandlerUtil processStepHandlerUtil; + @Override public String getHandler() { return ProcessStepHandlerType.OMNIPOTENT.getHandler(); @@ -141,7 +150,7 @@ public class OmnipotentProcessComponent extends ProcessStepHandlerBase { } /** 处理历史记录 **/ String action = currentProcessTaskStepVo.getParamObj().getString("action"); - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.getProcessTaskAuditType(action)); + processStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.getProcessTaskAuditType(action)); return 1; } @@ -151,7 +160,7 @@ public class OmnipotentProcessComponent extends ProcessStepHandlerBase { currentProcessTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.CAUSE.getParamName(), currentProcessTaskStepVo.getError()); } /** 处理历史记录 **/ - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.REAPPROVAL); + processStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.REAPPROVAL); return 1; } diff --git a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java index 33ee6fe456dfc56cee48830de458f52dceb55bc3..5b156b7422b44bb3b8a73e02331e768da252357f 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java @@ -15,6 +15,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.stephandler.component; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.TenantContext; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.asynchronization.threadpool.TransactionSynchronizationPool; @@ -32,8 +33,10 @@ import neatlogic.framework.scheduler.core.IJob; import neatlogic.framework.scheduler.core.SchedulerManager; import neatlogic.framework.scheduler.dto.JobObject; import neatlogic.framework.scheduler.exception.ScheduleHandlerNotFoundException; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.schedule.plugin.ProcessTaskStepTimerCompleteJob; -import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.module.process.service.ProcessTaskService; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -61,12 +64,21 @@ import java.util.Set; @Component public class TimerProcessComponent extends ProcessStepHandlerBase { + @Resource + private IProcessStepHandlerUtil processStepHandlerUtil; + @Resource private ProcessTaskService processTaskService; @Resource private SchedulerManager schedulerManager; + @Resource + private ProcessTaskMapper processTaskMapper; + + @Resource + private SelectContentByHashMapper selectContentByHashMapper; + private final Logger logger = LoggerFactory.getLogger(TimerProcessComponent.class); @Override @@ -291,7 +303,7 @@ public class TimerProcessComponent extends ProcessStepHandlerBase { currentProcessTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.CAUSE.getParamName(), currentProcessTaskStepVo.getError()); } /** 处理历史记录 **/ - IProcessStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.COMPLETE); + processStepHandlerUtil.audit(currentProcessTaskStepVo, ProcessTaskAuditType.COMPLETE); return 0; } diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java index 8dc64a59b98c0c743ab830b2d7780925eec68284..23bd5cf0c07a3451386842af25b2e249f77ed698 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java @@ -9,7 +9,7 @@ import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskStepDataMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.processconfig.*; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java index 9a2803dee55c7cb9826a6f6e6210ad736c1abe1b..d40236c1ac611f7bde7351f320c4eb74b01f75f7 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java @@ -15,6 +15,8 @@ along with this program. If not, see .*/ package neatlogic.module.process.stephandler.utilhandler; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.dto.ProcessStepVo; @@ -23,13 +25,13 @@ import neatlogic.framework.process.dto.ProcessTaskStepTimerVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase; import neatlogic.framework.process.util.ProcessConfigUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -39,6 +41,10 @@ import java.util.List; **/ @Component public class TimerProcessUtilHandler extends ProcessStepInternalHandlerBase { + + @Resource + private ProcessTaskMapper processTaskMapper; + @Override public String getHandler() { return ProcessStepHandlerType.TIMER.getHandler(); diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java index 53af8ffbec268e7c4090ca7220e3cd7df0490f01..655392a9be5ca71e59e4a32665b9e697ab2f2cf4 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java @@ -34,8 +34,8 @@ import neatlogic.framework.process.constvalue.ProcessFieldType; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskParams; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ActionVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskAuditThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskAuditThread.java index 91d1d77cf6a895d8d478160e284f1a58e6e46741..7a6aa760fe41117ff3273bdd964462c291dbf50f 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskAuditThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskAuditThread.java @@ -24,7 +24,7 @@ import neatlogic.framework.process.audithandler.core.IProcessTaskAuditDetailType import neatlogic.framework.process.audithandler.core.IProcessTaskAuditType; import neatlogic.framework.process.audithandler.core.ProcessTaskAuditDetailTypeFactory; import neatlogic.framework.process.audithandler.core.ProcessTaskAuditTypeFactory; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.util.FreemarkerUtil; import neatlogic.module.process.service.ProcessTaskService; diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskAutoScoreThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskAutoScoreThread.java index 1e80e895771046fb38bd6c1b98d6062634eeb18b..ff318839974f1b428c752c88960ce92bb0d23396 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskAutoScoreThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskAutoScoreThread.java @@ -18,9 +18,9 @@ package neatlogic.module.process.thread; import com.alibaba.fastjson.JSONPath; import neatlogic.framework.asynchronization.thread.NeatLogicThread; import neatlogic.framework.asynchronization.threadlocal.TenantContext; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; -import neatlogic.framework.process.dao.mapper.score.ProcessTaskScoreMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.score.ProcessTaskScoreMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.dto.score.ProcessTaskAutoScoreVo; import neatlogic.framework.scheduler.core.IJob; diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskAutomaticThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskAutomaticThread.java index 6ce975cb182f93ba1e900c96759de47b26e353d4..7c1a1bc814e8be37fd9c02b05ec41f28b0390792 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskAutomaticThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskAutomaticThread.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.thread; import neatlogic.framework.asynchronization.thread.NeatLogicThread; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.module.process.service.ProcessTaskAutomaticService; import org.springframework.stereotype.Component; diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskNotifyThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskNotifyThread.java index 0a11436743b91ff6b63098b60f863c6692cdde7b..adc48abbdb37f0c510cf9f49b067c277afa45d05 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskNotifyThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskNotifyThread.java @@ -29,8 +29,8 @@ import neatlogic.framework.notify.dto.NotifyReceiverVo; import neatlogic.framework.notify.dto.ParamMappingVo; import neatlogic.framework.process.condition.core.ProcessTaskConditionFactory; import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSerialNumberUpdateThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSerialNumberUpdateThread.java index 7899c5d4c85c74ca04650b7d29176084b44c59f5..01de8582e190c293db44da2e54a7e4d5f8bf9e1f 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSerialNumberUpdateThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSerialNumberUpdateThread.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.thread; import neatlogic.framework.asynchronization.thread.NeatLogicThread; -import neatlogic.framework.process.dao.mapper.ProcessTaskSerialNumberMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; import neatlogic.framework.process.dto.ProcessTaskSerialNumberPolicyVo; import neatlogic.framework.process.processtaskserialnumberpolicy.core.IProcessTaskSerialNumberPolicyHandler; import org.slf4j.Logger; diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java index 13141df601292d5b0c8e6b34eb196e7ee1d4cbdf..8a26e74dfd2500f87d524a6aeb551d467d0fbc18 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -23,8 +23,8 @@ import neatlogic.framework.process.condition.core.ProcessTaskConditionFactory; import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.SlaStatus; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.ProcessTaskSlaMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import neatlogic.framework.process.exception.sla.SlaCalculateHandlerNotFoundException; import neatlogic.framework.process.sla.core.ISlaCalculateHandler; import neatlogic.framework.process.sla.core.SlaCalculateHandlerFactory; diff --git a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskCatalogColumn.java b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskCatalogColumn.java index b280f5da35c5c348f1431031aac7e8bbc072e9ba..aafab0975a2bca70da10d283876ca90613eace38 100755 --- a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskCatalogColumn.java +++ b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskCatalogColumn.java @@ -6,7 +6,7 @@ import neatlogic.framework.dashboard.dto.DashboardWidgetAllGroupDefineVo; import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnBase; import neatlogic.framework.process.constvalue.ProcessFieldType; -import neatlogic.framework.process.dao.mapper.CatalogMapper; +import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.workcenter.dto.*; import neatlogic.framework.process.workcenter.table.CatalogSqlTable; diff --git a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskChannelColumn.java b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskChannelColumn.java index 015b89f4eed0224572f732abbc60dc88fab97222..5e9fca990a31371f5f839d6c6c636ccaa35594e3 100755 --- a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskChannelColumn.java +++ b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskChannelColumn.java @@ -6,7 +6,7 @@ import neatlogic.framework.dashboard.dto.DashboardWidgetGroupDefineVo; import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnBase; import neatlogic.framework.process.constvalue.ProcessFieldType; -import neatlogic.framework.process.dao.mapper.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.workcenter.dto.JoinOnVo; diff --git a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskChannelTypeColumn.java b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskChannelTypeColumn.java index 66fb7fd904f0e94c7c57616558c2dd39d36c06be..caa4009e01e813dfa680e885b5ab0cf9bda19e31 100644 --- a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskChannelTypeColumn.java +++ b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskChannelTypeColumn.java @@ -6,7 +6,7 @@ import neatlogic.framework.dashboard.dto.DashboardWidgetGroupDefineVo; import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnBase; import neatlogic.framework.process.constvalue.ProcessFieldType; -import neatlogic.framework.process.dao.mapper.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.ChannelTypeVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.workcenter.dto.JoinTableColumnVo; diff --git a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskPriorityColumn.java b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskPriorityColumn.java index 95ad7a3f817c4f4ec08fec0c5a62cd517b2ab275..2dc8011cc1791acc462c6f5be0a01d8a414539c5 100755 --- a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskPriorityColumn.java +++ b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskPriorityColumn.java @@ -6,7 +6,7 @@ import neatlogic.framework.dashboard.dto.DashboardWidgetGroupDefineVo; import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnBase; import neatlogic.framework.process.constvalue.ProcessFieldType; -import neatlogic.framework.process.dao.mapper.PriorityMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.framework.process.dto.PriorityVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.workcenter.dto.JoinOnVo; diff --git a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskScoreColumn.java b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskScoreColumn.java index 3d36a640a5de4ba9d6db80c7a378ed8bc4ee0037..2fc1050acb360d30848d2b81e98ed38d7a8eb857 100755 --- a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskScoreColumn.java +++ b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskScoreColumn.java @@ -3,9 +3,9 @@ package neatlogic.module.process.workcenter.column.handler; import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnBase; import neatlogic.framework.process.constvalue.ProcessFieldType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; -import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; -import neatlogic.framework.process.dao.mapper.score.ProcessTaskScoreMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.score.ProcessTaskScoreMapper; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.dto.score.ProcessTaskScoreVo; import neatlogic.framework.process.workcenter.dto.JoinOnVo; diff --git a/src/main/java/neatlogic/module/process/workcenter/init/WorkcenterInit.java b/src/main/java/neatlogic/module/process/workcenter/init/WorkcenterInit.java index 2c10fed2a73c64185b43e2b8ad3964cf27be9948..62c79d53a5f295844aa2a917bda6794100c62dac 100644 --- a/src/main/java/neatlogic/module/process/workcenter/init/WorkcenterInit.java +++ b/src/main/java/neatlogic/module/process/workcenter/init/WorkcenterInit.java @@ -20,7 +20,7 @@ import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.common.constvalue.UserType; import neatlogic.framework.process.constvalue.ProcessWorkcenterInitType; import neatlogic.framework.process.constvalue.ProcessWorkcenterType; -import neatlogic.framework.process.dao.mapper.workcenter.WorkcenterMapper; +import neatlogic.module.process.dao.mapper.workcenter.WorkcenterMapper; import neatlogic.framework.process.workcenter.dto.WorkcenterAuthorityVo; import neatlogic.framework.process.workcenter.dto.WorkcenterVo; import neatlogic.framework.startup.StartupBase; diff --git a/src/main/java/neatlogic/module/process/workerdispatcher/handler/HandlerLeaderDispatcher.java b/src/main/java/neatlogic/module/process/workerdispatcher/handler/HandlerLeaderDispatcher.java index 936b925f7db8759366b19ba74000045c72b2b09f..fa43d09c1265ec6e086a6907b989a1e2b10364c8 100755 --- a/src/main/java/neatlogic/module/process/workerdispatcher/handler/HandlerLeaderDispatcher.java +++ b/src/main/java/neatlogic/module/process/workerdispatcher/handler/HandlerLeaderDispatcher.java @@ -10,7 +10,7 @@ import neatlogic.framework.exception.team.TeamUserTitleNotFoundException; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; import neatlogic.framework.process.constvalue.ProcessTaskStepUserStatus; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; diff --git a/src/main/java/neatlogic/module/process/workerdispatcher/handler/OwnerLeaderDispatcher.java b/src/main/java/neatlogic/module/process/workerdispatcher/handler/OwnerLeaderDispatcher.java index 290acfa62a9f79fafa2e5f597e7cadb5ebe7309f..53be1b543b82cead812adddd6d545408e876348e 100755 --- a/src/main/java/neatlogic/module/process/workerdispatcher/handler/OwnerLeaderDispatcher.java +++ b/src/main/java/neatlogic/module/process/workerdispatcher/handler/OwnerLeaderDispatcher.java @@ -8,7 +8,7 @@ import neatlogic.framework.dto.TeamVo; import neatlogic.framework.dto.UserTitleVo; import neatlogic.framework.exception.team.TeamUserTitleNotFoundException; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/process/workerdispatcher/handler/WorkloadDispatcher.java b/src/main/java/neatlogic/module/process/workerdispatcher/handler/WorkloadDispatcher.java index 6b4ce2304a51cb5133de8e75e9d3eec372e9e7d9..edee6279bd63a9f4d4c3fbb7900391dc209d1f60 100644 --- a/src/main/java/neatlogic/module/process/workerdispatcher/handler/WorkloadDispatcher.java +++ b/src/main/java/neatlogic/module/process/workerdispatcher/handler/WorkloadDispatcher.java @@ -6,7 +6,7 @@ import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.dao.mapper.TeamMapper; import neatlogic.framework.dto.TeamUserVo; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; import neatlogic.framework.process.workerdispatcher.core.WorkerDispatcherBase; diff --git a/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java b/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java index d3afd197afe029ec23862b1f91a6892242efed7c..566ee66fefbebfb39a571252bc165544a34a6e9e 100644 --- a/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java @@ -16,7 +16,7 @@ import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.process.constvalue.ProcessTaskGroupSearch; import neatlogic.framework.process.constvalue.ProcessUserType; import neatlogic.framework.process.constvalue.WorkerPolicy; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerPolicyVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; diff --git a/src/main/java/neatlogic/module/process/workerpolicy/handler/CopyWorkerPolicyHandler.java b/src/main/java/neatlogic/module/process/workerpolicy/handler/CopyWorkerPolicyHandler.java index 5d87fbed6445ef9a0f8e855d27261938ed657038..31bccff2b5dd4a93bec2184a2b5f807a616a9af2 100644 --- a/src/main/java/neatlogic/module/process/workerpolicy/handler/CopyWorkerPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/workerpolicy/handler/CopyWorkerPolicyHandler.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.process.constvalue.ProcessUserType; import neatlogic.framework.process.constvalue.WorkerPolicy; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerPolicyVo; diff --git a/src/main/java/neatlogic/module/process/workerpolicy/handler/FormWorkerPolicyHandler.java b/src/main/java/neatlogic/module/process/workerpolicy/handler/FormWorkerPolicyHandler.java index 43f68906dc39c479d6baa11cc8c181e27b03f07a..1f5919f8822d2863faa5fe771ce5b065d99fd84d 100644 --- a/src/main/java/neatlogic/module/process/workerpolicy/handler/FormWorkerPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/workerpolicy/handler/FormWorkerPolicyHandler.java @@ -12,7 +12,7 @@ import neatlogic.framework.form.constvalue.FormHandler; import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.process.constvalue.ProcessUserType; import neatlogic.framework.process.constvalue.WorkerPolicy; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerPolicyVo; diff --git a/src/main/java/neatlogic/module/process/workerpolicy/handler/PreStepAssignWorkerPolicyHandler.java b/src/main/java/neatlogic/module/process/workerpolicy/handler/PreStepAssignWorkerPolicyHandler.java index 80d6223708af4b92fe6e11bd8674b971414e536a..da462a69365eb9b88d3705f3568f4b7b7b459723 100644 --- a/src/main/java/neatlogic/module/process/workerpolicy/handler/PreStepAssignWorkerPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/workerpolicy/handler/PreStepAssignWorkerPolicyHandler.java @@ -2,7 +2,7 @@ package neatlogic.module.process.workerpolicy.handler; import neatlogic.framework.process.constvalue.ProcessUserType; import neatlogic.framework.process.constvalue.WorkerPolicy; -import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskAssignWorkerVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerPolicyVo;