From 27935f58fdc6f243cec5590d1c73f4c27ee235a3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 6 Sep 2024 17:30:30 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?= =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768 --- .../crossover/IChannelCrossoverService.java | 26 +++++++++++++++++ .../IChannelTypeCrossoverMapper.java | 18 ++++++++++++ .../crossover/IPriorityCrossoverMapper.java | 28 +++++++++++++++++++ .../crossover/ITaskCrossoverMapper.java | 27 ++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverService.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/IPriorityCrossoverMapper.java create mode 100644 src/main/java/neatlogic/framework/process/crossover/ITaskCrossoverMapper.java 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 00000000..dfa13d10 --- /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 98df529c..3fcb1729 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java @@ -19,8 +19,26 @@ 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 + ); } 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 00000000..b5f8a5ba --- /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/ITaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/ITaskCrossoverMapper.java new file mode 100644 index 00000000..af027a72 --- /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); + +} -- Gitee From bb654f4c6697a260e7c1091d45c0da731ff95e2c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 6 Sep 2024 17:43:27 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?= =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768 --- .../crossover/ICatalogCrossoverMapper.java | 13 +++++++++++ .../crossover/IChannelCrossoverMapper.java | 6 +++++ .../IProcessTaskCrossoverMapper.java | 23 +++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/ICatalogCrossoverMapper.java index 8760a4dd..d768acbc 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 e894ba19..af2f4ca4 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java @@ -24,5 +24,11 @@ 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); } diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index b4d2c902..6806f6be 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,28 @@ 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); + int insertIgnoreProcessTaskConfig(ProcessTaskConfigVo processTaskConfigVo); int insertProcessTaskForm(ProcessTaskFormVo processTaskFormVo); -- Gitee From 27fa0f36f8fa57c3e41171d1e3f907016babe98d Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 6 Sep 2024 17:58:24 +0800 Subject: [PATCH 3/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?= =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768 --- .../process/crossover/IChannelTypeCrossoverMapper.java | 2 ++ .../process/crossover/IProcessTaskAgentCrossoverMapper.java | 2 ++ .../process/crossover/IProcessTaskCrossoverMapper.java | 2 ++ .../crossover/IProcessTaskStepTaskCrossoverMapper.java | 6 ++++++ 4 files changed, 12 insertions(+) diff --git a/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java index 3fcb1729..9f1a2461 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java @@ -41,4 +41,6 @@ public interface IChannelTypeCrossoverMapper extends ICrossoverService { @Param("parentUuidList") List parentUuidList, @Param("channelTypeUuidList") List channelTypeUuidList ); + + int checkChannelTypeRelationIsExists(Long id); } diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskAgentCrossoverMapper.java index 5fa24043..d14a5c97 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/IProcessTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index 6806f6be..b5f4c2c3 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java @@ -189,6 +189,8 @@ 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 updateProcessTaskStepStatus(ProcessTaskStepVo processTaskStepVo); int updateProcessTaskStatus(ProcessTaskVo processTaskVo); diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java index 867682d7..d3164df0 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java @@ -29,4 +29,10 @@ 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); } -- Gitee From ea70f579e1c43b7a4872ddb9bb47623650b93f83 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 6 Sep 2024 18:20:28 +0800 Subject: [PATCH 4/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?= =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768 --- ...rocessTaskCompleteApiCrossoverService.java | 25 ------------------- .../IProcessTaskCrossoverService.java | 18 +++++++++++++ 2 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessTaskCompleteApiCrossoverService.java 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 152729b0..00000000 --- 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/IProcessTaskCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java index f09d4282..50beea57 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java @@ -161,5 +161,23 @@ 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; } -- Gitee From 58d0ea4954e3f84696258a539505bfee83562ead Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 6 Sep 2024 18:36:30 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?= =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768 --- .../process/crossover/IChannelCrossoverMapper.java | 9 +++++++++ .../process/crossover/IChannelTypeCrossoverMapper.java | 2 ++ .../process/crossover/IProcessTaskCrossoverMapper.java | 10 ++++++++++ .../crossover/ISelectContentByHashCrossoverMapper.java | 3 +++ 4 files changed, 24 insertions(+) diff --git a/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java index af2f4ca4..1e2e7896 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelCrossoverMapper.java @@ -18,8 +18,11 @@ 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); @@ -31,4 +34,10 @@ public interface IChannelCrossoverMapper extends ICrossoverService { 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/IChannelTypeCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java index 9f1a2461..d1c70e27 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IChannelTypeCrossoverMapper.java @@ -43,4 +43,6 @@ public interface IChannelTypeCrossoverMapper extends ICrossoverService { ); int checkChannelTypeRelationIsExists(Long id); + + List getChannelTypeRelationTargetListByChannelTypeRelationId(Long channelTypeRelationId); } diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index b5f4c2c3..74945cf0 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java @@ -191,6 +191,16 @@ public interface IProcessTaskCrossoverMapper extends ICrossoverService { 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/ISelectContentByHashCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/ISelectContentByHashCrossoverMapper.java index b7e6c65f..2a8b1591 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); -- Gitee From 571085fc164756c4ab00f6c8da8b3fb40a3215f9 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 6 Sep 2024 18:40:02 +0800 Subject: [PATCH 6/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?= =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768 --- .../process/crossover/IProcessTaskCrossoverMapper.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index 74945cf0..323541c7 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java @@ -133,6 +133,14 @@ public interface IProcessTaskCrossoverMapper extends ICrossoverService { 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); + int insertIgnoreProcessTaskConfig(ProcessTaskConfigVo processTaskConfigVo); int insertProcessTaskForm(ProcessTaskFormVo processTaskFormVo); -- Gitee From e0b592583a896fe85511746a22aa2596708c7f4d Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 6 Sep 2024 18:48:19 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?= =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768 --- .../process/crossover/IProcessTaskCrossoverMapper.java | 2 ++ .../crossover/IProcessTaskStepTaskCrossoverMapper.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index 323541c7..8678048e 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java @@ -141,6 +141,8 @@ public interface IProcessTaskCrossoverMapper extends ICrossoverService { List getProcessTaskStepFileListByTaskStepId(Long taskId); + List getProcessTaskFormListByProcessTaskIdList(List existsProcessTaskIdList); + int insertIgnoreProcessTaskConfig(ProcessTaskConfigVo processTaskConfigVo); int insertProcessTaskForm(ProcessTaskFormVo processTaskFormVo); diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCrossoverMapper.java index d3164df0..ae0731dc 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; @@ -35,4 +36,8 @@ public interface IProcessTaskStepTaskCrossoverMapper extends ICrossoverService { List getStepTaskUserListByStepTaskId(Long processtaskStepTaskId); List getStepTaskByProcessTaskStepId(Long processTaskStepId); + + List getStepTaskUserByTaskIdAndUserUuid(@Param("processTaskStepTaskId") Long processTaskStepTaskId, @Param("userUuid") String userUuid); + + ProcessTaskStepTaskUserContentVo getStepTaskUserContentByStepTaskUserId(Long processTaskStepTaskUserId); } -- Gitee From 7990ae923a51c1472a2b76d25505ad930ad14dd8 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 7 Sep 2024 16:12:56 +0800 Subject: [PATCH 8/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?= =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768 --- .../process/crossover/IProcessTaskCrossoverService.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java index 50beea57..6eb60a64 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java @@ -179,5 +179,13 @@ public interface IProcessTaskCrossoverService extends ICrossoverService { * @throws Exception */ void startProcessTaskStep(JSONObject paramObj) throws Exception; + + /** + * 根据工单id和表单属性uuid获取表单属性数据 + * @param processTaskId 工单id + * @param attributeUuid 表单属性uuid + * @return + */ + ProcessTaskFormAttributeDataVo getProcessTaskFormAttributeDataByProcessTaskIdAndAttributeUuid(Long processTaskId, String attributeUuid); } -- Gitee From 2826dd577c24c2ccaf0193275908fd45dda78d9c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 9 Sep 2024 10:33:55 +0800 Subject: [PATCH 9/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?= =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768 --- ...skStepTaskCompleteApiCrossoverService.java | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/main/java/neatlogic/framework/process/crossover/IProcessTaskStepTaskCompleteApiCrossoverService.java 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 3b34fc94..00000000 --- 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; - -} -- Gitee