diff --git a/src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java index 8760a4dd4d4de5a7e4ad9155b7de24d900ab5e22..d768acbcd39975464f4b02b6db9753fa20a0270a 100644 --- a/src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java @@ -27,6 +27,19 @@ public interface ICatalogCrossoverMapper extends ICrossoverService { CatalogVo getCatalogByUuid(String uuid); + List getCatalogByName(String name); + List getUpwardUuidListByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht); + List getCatalogUuidListByLftRht(@Param("lft") Integer lft, @Param("rht")Integer rht); + /** + * + * @Time:2020年7月7日 + * @Description: 根据左右编码查出目录及所有上级目录 + * @param lft 左编码 + * @param rht 右编码 + * @return List + */ + List getAncestorsAndSelfByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht); + } diff --git a/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java index e894ba19197dfd132e18cea2bb1e6c2dd679e91b..1e2e789619487503c27e173b9a9e3afd2ed3199b 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java @@ -18,11 +18,26 @@ package neatlogic.framework.process.crossover; import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ChannelRelationVo; import neatlogic.framework.process.dto.ChannelVo; +import java.util.List; + public interface IChannelCrossoverMapper extends ICrossoverService { ChannelVo getChannelByUuid(String channelUuid); + ChannelVo getChannelByName(String channelName); + String getWorktimeUuidByChannelUuid(String channelUuid); + + String getProcessUuidByChannelUuid(String channelUuid); + + int checkChannelNameIsRepeat(ChannelVo channelVo); + + List getChannelRelationTargetList(ChannelRelationVo channelRelationVo); + + int searchChannelCount(ChannelVo channelVo); + + List searchChannelList(ChannelVo channelVo); } diff --git a/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverService.java new file mode 100644 index 0000000000000000000000000000000000000000..dfa13d1040e8f485204be59a0296c8112847b3c4 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverService.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.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ChannelVo; + +public interface IChannelCrossoverService extends ICrossoverService { + + String saveChannel(ChannelVo channelVo); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java index 98df529c59d8866e3f8e5f68fd85a72c516641c8..d1c70e27f142d2834cfafd442edb41a4115521c4 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java @@ -19,8 +19,30 @@ package neatlogic.framework.process.crossover; import neatlogic.framework.crossover.ICrossoverService; import neatlogic.framework.process.dto.ChannelTypeVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface IChannelTypeCrossoverMapper extends ICrossoverService { ChannelTypeVo getChannelTypeByUuid(String uuid); + + ChannelTypeVo getChannelTypeByName(String name); + + 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 checkChannelTypeRelationIsExists(Long id); + + List getChannelTypeRelationTargetListByChannelTypeRelationId(Long channelTypeRelationId); } diff --git a/src/main/java/neatlogic/framework/process/crossover/IPriorityCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IPriorityCrossoverMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..b5f8a5ba90ccfbf5244ada088ab8f9ff8528c6b8 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/IPriorityCrossoverMapper.java @@ -0,0 +1,28 @@ +/* + * 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.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.PriorityVo; + +public interface IPriorityCrossoverMapper extends ICrossoverService { + + PriorityVo getPriorityByUuid(String uuid); + + PriorityVo getPriorityByName(String objValue); +} diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java index 5fa2404307c666da60cf98f4d69b7689653b112d..d14a5c97f870ab6ee2989a00751f25823ad64379 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java @@ -25,4 +25,6 @@ import java.util.List; public interface IProcessTaskAgentCrossoverMapper extends ICrossoverService { List getProcessTaskAgentDetailListByToUserUuid(String toUserUuid); + + List getProcessTaskAgentDetailListByFromUserUuidList(List fromUserUuidList); } diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCompleteApiCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCompleteApiCrossoverService.java deleted file mode 100644 index 152729b0b2c66e4484b55513e53a5cf317b86d0e..0000000000000000000000000000000000000000 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCompleteApiCrossoverService.java +++ /dev/null @@ -1,25 +0,0 @@ -/*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.framework.process.crossover; - -import neatlogic.framework.crossover.ICrossoverService; -import com.alibaba.fastjson.JSONObject; - -public interface IProcessTaskCompleteApiCrossoverService extends ICrossoverService { - - Object myDoService(JSONObject jsonObj) throws Exception; - -} diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index b4d2c9024b204c6050f3a6a24197fcbd9cf29897..8678048e410f6250b28b5fcd909ed8e2bba5a5e0 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java @@ -19,6 +19,7 @@ package neatlogic.framework.process.crossover; import neatlogic.framework.crossover.ICrossoverService; import neatlogic.framework.dto.AuthenticationInfoVo; +import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.process.dto.*; import org.apache.ibatis.annotations.Param; @@ -110,6 +111,38 @@ public interface IProcessTaskCrossoverMapper extends ICrossoverService { ProcessTaskInvokeVo getInvokeByProcessTaskId(Long processTaskId); + ProcessTaskStepVo getStartProcessTaskStepByProcessTaskId(Long processTaskId); + + /** + * 获取工单基本信息（已删除则忽略） + * + * @param processTaskId + * @return + */ + ProcessTaskVo getProcessTaskBaseInfoById(Long processTaskId); + + List getFileListByProcessTaskId(Long processTaskId); + + List getProcessTaskStepFileListByTaskId(Long taskId); + + List checkProcessTaskIdListIsExists(List processTaskIdList); + + List getProcessTaskStepContentByProcessTaskStepId(Long processTaskStepId); + + int getProcessTaskCountByOwner(ProcessTaskVo vo); + + List getProcessTaskListByOwner(ProcessTaskVo vo); + + List getProcessTaskActiveStepByProcessTaskIdAndProcessStepType( + @Param("processTaskId") Long processTaskId, @Param("processStepTypeList") List processStepTypeList, + @Param("isActive") Integer isActive); + + List getFromProcessTaskStepIdListByToId(Long toProcessTaskStepId); + + List getProcessTaskStepFileListByTaskStepId(Long taskId); + + List getProcessTaskFormListByProcessTaskIdList(List existsProcessTaskIdList); + int insertIgnoreProcessTaskConfig(ProcessTaskConfigVo processTaskConfigVo); int insertProcessTaskForm(ProcessTaskFormVo processTaskFormVo); @@ -166,6 +199,18 @@ public interface IProcessTaskCrossoverMapper extends ICrossoverService { int insertProcessTaskInvoke(@Param("processTaskId") Long processTaskId, @Param("source") String invoke, @Param("sourceType") String invokeType, @Param("invokeId") Long invokeId); + int replaceProcessTaskRelation(ProcessTaskRelationVo processTaskRelationVo); + + int replaceProcessTaskStep(ProcessTaskStepVo processTaskStepVo); + + int insertProcessTaskStepContent(ProcessTaskStepContentVo processTaskStepContentVo); + + int batchInsertProcessTaskStepAudit(List list); + + int batchInsertProcessTaskStepAuditDetail(List list); + + int batchInsertIgnoreProcessTaskContent(List list); + int updateProcessTaskStepStatus(ProcessTaskStepVo processTaskStepVo); int updateProcessTaskStatus(ProcessTaskVo processTaskVo); diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java index f09d4282beff28763a4829c5db03794188f6a5bb..6eb60a64cc1d9472db0713f499af7e18129eea60 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java @@ -161,5 +161,31 @@ public interface IProcessTaskCrossoverService extends ICrossoverService { * @return */ List getProcessTaskFormAttributeDataListByProcessTaskIdAndTagNew(Long processTaskId, String tag); + + /** + * 完成工单步骤 + * + * @param paramObj 参数结构见processtask/complete接口 + * @return + * @throws Exception + */ + void completeProcessTaskStep(JSONObject paramObj) throws Exception; + + /** + * 开始工单步骤 + * + * @param paramObj 参数结构见processtask/start接口 + * @return + * @throws Exception + */ + void startProcessTaskStep(JSONObject paramObj) throws Exception; + + /** + * 根据工单id和表单属性uuid获取表单属性数据 + * @param processTaskId 工单id + * @param attributeUuid 表单属性uuid + * @return + */ + ProcessTaskFormAttributeDataVo getProcessTaskFormAttributeDataByProcessTaskIdAndAttributeUuid(Long processTaskId, String attributeUuid); } diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCompleteApiCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCompleteApiCrossoverService.java deleted file mode 100644 index 3b34fc946d32a4fa950ca288531e64f3d2652348..0000000000000000000000000000000000000000 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCompleteApiCrossoverService.java +++ /dev/null @@ -1,25 +0,0 @@ -/*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.framework.process.crossover; - -import neatlogic.framework.crossover.ICrossoverService; -import com.alibaba.fastjson.JSONObject; - -public interface IProcessTaskStepTaskCompleteApiCrossoverService extends ICrossoverService { - - Object myDoService(JSONObject jsonObj) throws Exception; - -} diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java index 867682d7517df88a835760f3caaf7cafb52fd024..ae0731dc5567ed26903ee32b9c26a33bd5d05c50 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java @@ -18,6 +18,7 @@ package neatlogic.framework.process.crossover; import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.ProcessTaskStepTaskUserContentVo; import neatlogic.framework.process.dto.ProcessTaskStepTaskUserVo; import neatlogic.framework.process.dto.ProcessTaskStepTaskVo; import org.apache.ibatis.annotations.Param; @@ -29,4 +30,14 @@ public interface IProcessTaskStepTaskCrossoverMapper extends ICrossoverService { List getStepTaskListByProcessTaskStepId(Long processTaskStepId); List getStepTaskUserByStepTaskIdList(@Param("stepTaskIdList") List collect); + + ProcessTaskStepTaskVo getStepTaskById(Long processTaskStepTaskId); + + List getStepTaskUserListByStepTaskId(Long processtaskStepTaskId); + + List getStepTaskByProcessTaskStepId(Long processTaskStepId); + + List getStepTaskUserByTaskIdAndUserUuid(@Param("processTaskStepTaskId") Long processTaskStepTaskId, @Param("userUuid") String userUuid); + + ProcessTaskStepTaskUserContentVo getStepTaskUserContentByStepTaskUserId(Long processTaskStepTaskUserId); } diff --git a/src/main/java/neatlogic/framework/process/crossover/ISelectContentByHashCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/ISelectContentByHashCrossoverMapper.java index b7e6c65fa24eb8c04f9b2680f9cc559f01c41d01..2a8b1591a5d432b12b22d74ce83e077e6a812ba0 100644 --- a/src/main/java/neatlogic/framework/process/crossover/ISelectContentByHashCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/ISelectContentByHashCrossoverMapper.java @@ -19,6 +19,7 @@ package neatlogic.framework.process.crossover; import neatlogic.framework.crossover.ICrossoverService; import neatlogic.framework.process.dto.ProcessTaskConfigVo; +import neatlogic.framework.process.dto.ProcessTaskContentVo; import java.util.List; @@ -26,6 +27,8 @@ public interface ISelectContentByHashCrossoverMapper extends ICrossoverService { String getProcessTaskStepConfigByHash(String hash); + ProcessTaskContentVo getProcessTaskContentByHash(String hash); + String getProcessTaskContentStringByHash(String hash); String getProcessTaskFromContentByHash(String hash); diff --git a/src/main/java/neatlogic/framework/process/crossover/ITaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/ITaskCrossoverMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..af027a728dfb5f1de80db3327f302263f21b4016 --- /dev/null +++ b/src/main/java/neatlogic/framework/process/crossover/ITaskCrossoverMapper.java @@ -0,0 +1,27 @@ +/* + * 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.framework.process.crossover; + +import neatlogic.framework.crossover.ICrossoverService; +import neatlogic.framework.process.dto.TaskConfigVo; + +public interface ITaskCrossoverMapper extends ICrossoverService { + + TaskConfigVo getTaskConfigById(Long taskId); + +}