From 06ff4ed8e0cb3f008d360dc0d2699c4b916fb64b Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Wed, 6 Mar 2024 19:22:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]ITSM=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=88=B6=E5=AD=90=E6=B5=81=E7=A8=8B=20#[9983?=
 =?UTF-8?q?28148393984]ITSM=E6=B5=81=E7=A8=8B=E6=94=AF=E6=8C=81=E7=88=B6?=
 =?UTF-8?q?=E5=AD=90=E6=B5=81=E7=A8=8B=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/99832814839?=
 =?UTF-8?q?3984?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constvalue/IProcessTaskSource.java        |  4 ++
 .../constvalue/ProcessTaskSourceFactory.java  |  6 +++
 .../constvalue/ProcessTaskSourceType.java     | 23 ++++++++++
 .../constvalue/ProcessTaskStepTaskSource.java | 23 ++++++++++
 .../process/dao/mapper/ChannelMapper.java     |  2 +
 .../process/dao/mapper/ChannelMapper.xml      | 15 +++++++
 .../process/dao/mapper/ProcessTaskMapper.java |  9 +++-
 .../process/dao/mapper/ProcessTaskMapper.xml  | 44 +++++++++++++++++++
 .../ProcessTaskSourceNotFoundException.java   | 27 ++++++++++++
 .../core/IProcessStepInternalHandler.java     |  4 +-
 .../core/ProcessStepHandlerBase.java          | 31 +++++++++----
 11 files changed, 177 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceType.java
 create mode 100644 src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepTaskSource.java
 create mode 100644 src/main/java/neatlogic/framework/process/exception/processtask/ProcessTaskSourceNotFoundException.java

diff --git a/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java b/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java
index dbf4e9ab..a3d6fdf6 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java
@@ -27,4 +27,8 @@ public interface IProcessTaskSource {
     String getValue();
 
     String getText();
+
+    default String getType(){
+        return ProcessTaskSourceType.ITSM.getValue();
+    }
 }
diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceFactory.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceFactory.java
index da44354f..f3e6c1e4 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceFactory.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceFactory.java
@@ -25,6 +25,7 @@ import java.util.Set;
 public class ProcessTaskSourceFactory {
 
     private static final Map<String, String> sourcelValueTextMap = new HashMap<>();
+    private static final Map<String, IProcessTaskSource> sourcelMap = new HashMap<>();
 
     static {
         Reflections reflections = new Reflections("neatlogic");
@@ -34,6 +35,7 @@ public class ProcessTaskSourceFactory {
                 Object[] objects = c.getEnumConstants();
                 for (Object o : objects) {
                     sourcelValueTextMap.put(((IProcessTaskSource) o).getValue(), ((IProcessTaskSource) o).getText());
+                    sourcelMap.put(((IProcessTaskSource) o).getValue(),(IProcessTaskSource)o);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -45,4 +47,8 @@ public class ProcessTaskSourceFactory {
         return sourcelValueTextMap.get(value);
     }
 
+    public static IProcessTaskSource getSource(String value) {
+        return sourcelMap.get(value);
+    }
+
 }
diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceType.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceType.java
new file mode 100644
index 00000000..68187767
--- /dev/null
+++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceType.java
@@ -0,0 +1,23 @@
+package neatlogic.framework.process.constvalue;
+
+import neatlogic.framework.util.$;
+
+public enum ProcessTaskSourceType {
+    ITSM("itsm", "term.itsm.groupname");
+
+    private final String value;
+    private final String text;
+
+    private ProcessTaskSourceType(String value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getText() {
+        return $.t(text);
+    }
+}
diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepTaskSource.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepTaskSource.java
new file mode 100644
index 00000000..1911a4e2
--- /dev/null
+++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepTaskSource.java
@@ -0,0 +1,23 @@
+package neatlogic.framework.process.constvalue;
+
+public enum ProcessTaskStepTaskSource implements IProcessTaskSource {
+    PROCESSTASKSTEP("工单步骤", "processtaskstep");
+    private final String text;
+    private final String value;
+
+
+    ProcessTaskStepTaskSource(String _text, String _value) {
+        this.text = _text;
+        this.value = _value;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String getText() {
+        return text;
+    }
+}
diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.java
index f0a5a32b..3492a1d7 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.java
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.java
@@ -81,6 +81,8 @@ public interface ChannelMapper {
 
     List<ChannelVo> getChannelListByChannelTypeUuidList(List<String> channelTypeUuidList);
 
+    List<ChannelVo> getChannelListByChannelUuidList(List<String> channelUuidList);
+
     List<ChannelRelationVo> getChannelRelationListBySource(String channelUuid);
 
     List<ChannelRelationVo> getChannelRelationAuthorityListBySource(String channelUuid);
diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.xml
index f7306467..947ce6bf 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.xml
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ChannelMapper.xml
@@ -548,6 +548,21 @@ limitations under the License.
         </foreach>
     </select>
 
+    <select id="getChannelListByChannelUuidList" parameterType="java.lang.String" resultMap="simpleChannelMap"
+            useCache="false">
+        SELECT
+        `uuid`,
+        `name`,
+        `parent_uuid`,
+        `sort`,
+        `is_active`
+        FROM `channel`
+        WHERE `uuid` IN
+        <foreach collection="list" item="channelUuid" open="(" separator="," close=")">
+            #{channelUuid}
+        </foreach>
+    </select>
+
     <select id="getChannelRelationListBySource" parameterType="java.lang.String"
             resultType="neatlogic.framework.process.dto.ChannelRelationVo" useCache="false">
         SELECT `source`,
diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
index 9dbf94a5..371e6713 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
@@ -347,6 +347,10 @@ public interface ProcessTaskMapper {
 
     List<ProcessTaskVo> searchProcessTaskListByOwnerAndExcludeId(ProcessTaskSearchVo searchVo);
 
+    int getSubProcessTaskCountByStepId(Long processTaskStepId);
+
+    List<ProcessTaskVo> SearchSubProcessTaskListByStepId(Long processTaskStepId);
+
     int insertIgnoreProcessTaskConfig(ProcessTaskConfigVo processTaskConfigVo);
 
     int replaceProcessTaskOldFormProp(@Param("processTaskId") Long processTaskId, @Param("form") String form,
@@ -446,6 +450,8 @@ public interface ProcessTaskMapper {
 
     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 updateProcessTaskStepStatus(ProcessTaskStepVo processTaskStepVo);
 
     int updateProcessTaskStatus(ProcessTaskVo processTaskVo);
@@ -460,7 +466,7 @@ public interface ProcessTaskMapper {
 
     int updateProcessTaskIsShow(ProcessTaskVo processTaskVo);
 
-    int updateProcessTaskNeedScoreByIdList(@Param("idList")List<Long> idList, @Param("needScore")Integer needScore);
+    int updateProcessTaskNeedScoreByIdList(@Param("idList") List<Long> idList, @Param("needScore") Integer needScore);
 
     int updateProcessTaskTitleOwnerPriorityUuid(ProcessTaskVo processTaskVo);
 
@@ -552,4 +558,5 @@ public interface ProcessTaskMapper {
     int deleteProcessTaskTimeCostByProcessTaskId(Long processTaskId);
 
     int deleteProcessTaskFormContentByHash(String hash);
+
 }
diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
index 7f3addc3..4f3f042e 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
@@ -1992,6 +1992,7 @@ limitations under the License.
         <result column="priority_uuid" property="priorityUuid"/>
         <result column="processTaskStatus" property="status"/>
         <result column="start_time" property="startTime"/>
+        <result column="status" property="status"/>
         <result column="end_time" property="endTime"/>
         <result column="ownerUuid" property="owner"/>
         <result column="reporterUuid" property="reporter"/>
@@ -2755,6 +2756,45 @@ limitations under the License.
         ORDER BY `id` DESC
             LIMIT #{startNum}, #{pageSize}
     </select>
+    <select id="getSubProcessTaskCountByStepId" resultType="java.lang.Integer">
+        SELECT
+           count(1)
+        FROM `processtask` pt
+        join `processtask_invoke` as pi on pt.id = pi.processtask_id and pi.invoke_id = #{value}
+        WHERE  pt.`is_deleted` = 0
+    </select>
+
+    <select id="SearchSubProcessTaskListByStepId" resultMap="workcenterProcessTaskMap">
+        SELECT
+            pt.`id`,
+            pt.`title`,
+            pt.`process_uuid` AS processUuid,
+            pt.`channel_uuid` AS channelUuid,
+            pt.`config_hash` AS configHash,
+            pt.`priority_uuid` AS priorityUuid,
+            pt.`status`,
+            pt.`start_time`,
+            pt.`end_time`,
+            pt.`owner`,
+            pt.`reporter`,
+            pt.`expire_time` AS expireTime,
+            pt.`worktime_uuid` AS worktimeUuid,
+            pt.`error`,
+            pt.`is_show` AS isShow,
+            pt.`serial_number` AS serialNumber,
+            pt.`source`,
+            pt.`is_deleted` AS isDeleted,
+            pt.`need_score` AS needScore,
+            pri.`name` as priorityName,
+            pri.`color` as priorityColor,
+            c.`name` as channelName
+        FROM `processtask` pt
+                 join `processtask_invoke` as pi on pt.id = pi.processtask_id and pi.invoke_id = #{value}
+                 left join `priority` pri on pt.`priority_uuid` = pri.`uuid`
+                 left join `channel` c on pt.`channel_uuid` = c.`uuid`
+        WHERE  pt.`is_deleted` = 0
+        ORDER BY pt.`id` DESC
+    </select>
 
     <!--<update id="updateProcessTaskStepConvergeIsCheck">
         UPDATE `processtask_converge`
@@ -3519,6 +3559,10 @@ limitations under the License.
         INSERT INTO `processtask_urge` (`processtask_id`, `lcu`, `lcd`)
         VALUES (#{processTaskId}, #{lcu}, NOW(3))
     </insert>
+    <insert id="insertProcessTaskInvoke">
+        INSERT INTO `processtask_invoke` (`processtask_id`, `source`, `type`, `invoke_id`)
+        VALUES (#{processTaskId}, #{source}, #{sourceType}, #{invokeId});
+    </insert>
 
     <update id="updateProcessTaskStepUserStatus" parameterType="neatlogic.framework.process.dto.ProcessTaskStepUserVo">
         UPDATE
diff --git a/src/main/java/neatlogic/framework/process/exception/processtask/ProcessTaskSourceNotFoundException.java b/src/main/java/neatlogic/framework/process/exception/processtask/ProcessTaskSourceNotFoundException.java
new file mode 100644
index 00000000..cf5ff178
--- /dev/null
+++ b/src/main/java/neatlogic/framework/process/exception/processtask/ProcessTaskSourceNotFoundException.java
@@ -0,0 +1,27 @@
+/*
+Copyright(c) 2023 NeatLogic Co., Ltd. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. 
+ */
+
+package neatlogic.framework.process.exception.processtask;
+
+import neatlogic.framework.exception.core.ApiRuntimeException;
+
+public class ProcessTaskSourceNotFoundException extends ApiRuntimeException {
+
+    public ProcessTaskSourceNotFoundException(String msg) {
+        super("工单来源{0}不存在", msg);
+    }
+
+}
diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepInternalHandler.java b/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepInternalHandler.java
index a5991747..8a07480c 100644
--- a/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepInternalHandler.java
+++ b/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepInternalHandler.java
@@ -40,14 +40,14 @@ public interface IProcessStepInternalHandler {
      * @param @return
      * @return Object
      * @Time: 2020年7月27日
-     * @Description: 处理器特有的步骤信息
+     * @Description: 处理器特有的步骤信息（作为开始节点获取开始节点信息）
      */
     public Object getHandlerStepInfo(ProcessTaskStepVo currentProcessTaskStepVo);
 
     /**
      *
      * @Time: 2020年8月12日
-     * @Description: 处理器特有的步骤初始化信息
+     * @Description: 处理器特有的步骤初始化信息 （作为当前处理节点获取开始节点信息）
      * @param @return
      * @return Object
      */
diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
index a84e5b05..e9977229 100644
--- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
+++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
@@ -170,7 +170,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
         processTaskSerialNumberMapper = _processTaskSerialNumberMapper;
     }
 
-//    @Autowired(required = false)
+    //    @Autowired(required = false)
     @Resource
     public void setIProcessStepHandlerUtil(IProcessStepHandlerUtil _processStepHandlerUtil) {
         IProcessStepHandlerUtil = _processStepHandlerUtil;
@@ -190,6 +190,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
     public void setScoreTemplateMapper(ScoreTemplateMapper _scoreTemplateMapper) {
         scoreTemplateMapper = _scoreTemplateMapper;
     }
+
     private int updateProcessTaskStatus(Long processTaskId) {
         List<ProcessTaskStepVo> processTaskStepList = processTaskMapper.getProcessTaskStepBaseInfoByProcessTaskId(processTaskId);
 
@@ -1956,6 +1957,17 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
             if (fromProcessTaskId != null && channelTypeRelationId != null) {
                 processTaskMapper.insertProcessTaskTransferReport(new ProcessTaskTransferReportVo(channelTypeRelationId, fromProcessTaskId, processTaskVo.getId()));
             }
+
+            //保存父子工单关系
+            String invoke = paramObj.getString("invoke");
+            if (StringUtils.isNotBlank(invoke)) {
+                IProcessTaskSource processTaskSource = ProcessTaskSourceFactory.getSource(invoke);
+                if (processTaskSource == null) {
+                    throw new ProcessTaskSourceNotFoundException(invoke);
+                }
+                Long invokeId = paramObj.getLong("parentProcessTaskStepId");
+                processTaskMapper.insertProcessTaskInvoke(currentProcessTaskStepVo.getProcessTaskId(), processTaskSource.getValue(), processTaskSource.getType(), invokeId);
+            }
         } else {
             /* 锁定当前流程 **/
             processTaskMapper.getProcessTaskLockById(processTaskId);
@@ -2539,7 +2551,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
                 );
                 flag = processTaskMapper.checkIsProcessTaskStepUser(searchVo);
             } else {
-                AuthenticationInfoVo authenticationInfoVo = UserContext.get().getAuthenticationInfoVo();;
+                AuthenticationInfoVo authenticationInfoVo = UserContext.get().getAuthenticationInfoVo();
+                ;
                 flag = processTaskMapper.checkIsWorker(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), ProcessUserType.MAJOR.getValue(), authenticationInfoVo);
             }
 
@@ -2611,10 +2624,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
 
     /**
      * 更新processtask_step_worker表的uuid字段值
-     * @param processTaskId 工单ID
+     *
+     * @param processTaskId     工单ID
      * @param processTaskStepId 步骤ID
-     * @param oldUuid 旧值
-     * @param newUuid 新值
+     * @param oldUuid           旧值
+     * @param newUuid           新值
      */
     private void updateProcessTaskStepWorkerUuid(Long processTaskId, Long processTaskStepId, String oldUuid, String newUuid) {
         ProcessTaskStepWorkerVo processTaskStepWorkerVo = new ProcessTaskStepWorkerVo(
@@ -2639,10 +2653,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
 
     /**
      * 更新processtask_step_user表的user_uuid字段值
-     * @param processTaskId 工单ID
+     *
+     * @param processTaskId     工单ID
      * @param processTaskStepId 步骤ID
-     * @param oldUserUuid 旧值
-     * @param newUserUuid 新值
+     * @param oldUserUuid       旧值
+     * @param newUserUuid       新值
      */
     private void updateProcessTaskStepUserUserUuid(Long processTaskId, Long processTaskStepId, String oldUserUuid, String newUserUuid) {
         ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(
-- 
Gitee


From 4c3be42dbffaa376dd003a80965f7cfa1370c7c9 Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Thu, 7 Mar 2024 19:20:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]ITSM=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=88=B6=E5=AD=90=E6=B5=81=E7=A8=8B=20#[9983?=
 =?UTF-8?q?28148393984]ITSM=E6=B5=81=E7=A8=8B=E6=94=AF=E6=8C=81=E7=88=B6?=
 =?UTF-8?q?=E5=AD=90=E6=B5=81=E7=A8=8B=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/99832814839?=
 =?UTF-8?q?3984?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constvalue/IProcessTaskSource.java        | 12 ++++++
 .../constvalue/ProcessTaskSourceFactory.java  | 41 +++++++++++++++++--
 .../process/dao/mapper/ProcessTaskMapper.java |  2 +
 .../process/dao/mapper/ProcessTaskMapper.xml  | 12 ++++++
 .../core/ProcessStepHandlerBase.java          |  7 ++--
 5 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java b/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java
index a3d6fdf6..9c6b5131 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java
@@ -16,6 +16,9 @@ limitations under the License.
 
 package neatlogic.framework.process.constvalue;
 
+import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.process.dto.ProcessTaskVo;
+
 /**
  * 工单上报来源或办理渠道
  *
@@ -31,4 +34,13 @@ public interface IProcessTaskSource {
     default String getType(){
         return ProcessTaskSourceType.ITSM.getValue();
     }
+
+    /**
+     * 保存工单会执行的操作
+     *
+     * @param paramObj 上报暂存入参
+     * @param processTaskVo 工单对象
+     */
+    default void saveDraft(JSONObject paramObj, ProcessTaskVo processTaskVo){
+    }
 }
diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceFactory.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceFactory.java
index f3e6c1e4..8e7721d5 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceFactory.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskSourceFactory.java
@@ -16,22 +16,31 @@ limitations under the License.
 
 package neatlogic.framework.process.constvalue;
 
+import neatlogic.framework.applicationlistener.core.ModuleInitializedListenerBase;
+import neatlogic.framework.bootstrap.NeatLogicWebApplicationContext;
+import neatlogic.framework.common.RootComponent;
 import org.reflections.Reflections;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-
-public class ProcessTaskSourceFactory {
-
+@RootComponent
+public class ProcessTaskSourceFactory extends ModuleInitializedListenerBase {
+    Logger logger = LoggerFactory.getLogger(ProcessTaskSourceFactory.class);
     private static final Map<String, String> sourcelValueTextMap = new HashMap<>();
     private static final Map<String, IProcessTaskSource> sourcelMap = new HashMap<>();
+    private static final Map<String, IProcessTaskSource> handlerMap = new HashMap<>();
 
     static {
         Reflections reflections = new Reflections("neatlogic");
         Set<Class<? extends IProcessTaskSource>> clazz = reflections.getSubTypesOf(IProcessTaskSource.class);
         for (Class<? extends IProcessTaskSource> c : clazz) {
             try {
+                if (!c.isEnum()) {
+                    continue;
+                }
                 Object[] objects = c.getEnumConstants();
                 for (Object o : objects) {
                     sourcelValueTextMap.put(((IProcessTaskSource) o).getValue(), ((IProcessTaskSource) o).getText());
@@ -51,4 +60,30 @@ public class ProcessTaskSourceFactory {
         return sourcelMap.get(value);
     }
 
+    public static IProcessTaskSource getHandler(String handler) {
+        return handlerMap.get(handler);
+    }
+
+    @Override
+    protected void onInitialized(NeatLogicWebApplicationContext context) {
+        Map<String, IProcessTaskSource> myMap = context.getBeansOfType(IProcessTaskSource.class);
+        for (Map.Entry<String, IProcessTaskSource> entry : myMap.entrySet()) {
+            try {
+                IProcessTaskSource handler = entry.getValue();
+                if (handlerMap.containsKey(handler.getValue())) {
+                    logger.error("IProcessTaskSource '" + handler.getClass().getSimpleName() + "(" + handler.getValue() + ")' repeat");
+                    System.exit(1);
+                }
+                handlerMap.put(handler.getValue(), handler);
+            } catch (Exception e) {
+                logger.error(e.getMessage(), e);
+            }
+        }
+    }
+
+    @Override
+    protected void myInit() {
+
+    }
+
 }
diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
index 371e6713..ce6100ca 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
@@ -351,6 +351,8 @@ public interface ProcessTaskMapper {
 
     List<ProcessTaskVo> SearchSubProcessTaskListByStepId(Long processTaskStepId);
 
+    int getSubProcessTaskCountByStepIdAndWithoutEndStatusList(@Param("processTaskStepId") Long processTaskStepId,@Param("statusList") List<String> statusList);
+
     int insertIgnoreProcessTaskConfig(ProcessTaskConfigVo processTaskConfigVo);
 
     int replaceProcessTaskOldFormProp(@Param("processTaskId") Long processTaskId, @Param("form") String form,
diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
index 4f3f042e..f77a17d0 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
@@ -2796,6 +2796,18 @@ limitations under the License.
         ORDER BY pt.`id` DESC
     </select>
 
+    <select id="getSubProcessTaskCountByStepIdAndWithoutEndStatusList" resultType="java.lang.Integer">
+        SELECT
+        count(1)
+        FROM `processtask` pt
+        join `processtask_invoke` as pi on pt.id = pi.processtask_id and pi.invoke_id = #{processTaskStepId}
+        WHERE  pt.`is_deleted` = 0
+        and pt.status not in
+        <foreach collection="statusList" item="status" close=")" open="(" separator="," >
+            #{status}
+        </foreach>
+    </select>
+
     <!--<update id="updateProcessTaskStepConvergeIsCheck">
         UPDATE `processtask_converge`
         SET is_check = #{isCheck}
diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
index e9977229..8d65377a 100644
--- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
+++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
@@ -1958,15 +1958,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
                 processTaskMapper.insertProcessTaskTransferReport(new ProcessTaskTransferReportVo(channelTypeRelationId, fromProcessTaskId, processTaskVo.getId()));
             }
 
-            //保存父子工单关系
+            //父子工单
             String invoke = paramObj.getString("invoke");
             if (StringUtils.isNotBlank(invoke)) {
-                IProcessTaskSource processTaskSource = ProcessTaskSourceFactory.getSource(invoke);
+                IProcessTaskSource processTaskSource = ProcessTaskSourceFactory.getHandler(invoke);
                 if (processTaskSource == null) {
                     throw new ProcessTaskSourceNotFoundException(invoke);
                 }
-                Long invokeId = paramObj.getLong("parentProcessTaskStepId");
-                processTaskMapper.insertProcessTaskInvoke(currentProcessTaskStepVo.getProcessTaskId(), processTaskSource.getValue(), processTaskSource.getType(), invokeId);
+                processTaskSource.saveDraft(paramObj, processTaskVo);
             }
         } else {
             /* 锁定当前流程 **/
-- 
Gitee


From 461a7d09f8099f297ca3b9ed2feb27e67fe90a6e Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Fri, 8 Mar 2024 18:09:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]ITSM=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=88=B6=E5=AD=90=E6=B5=81=E7=A8=8B=20#[9983?=
 =?UTF-8?q?28148393984]ITSM=E6=B5=81=E7=A8=8B=E6=94=AF=E6=8C=81=E7=88=B6?=
 =?UTF-8?q?=E5=AD=90=E6=B5=81=E7=A8=8B=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/99832814839?=
 =?UTF-8?q?3984?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constvalue/IProcessTaskSource.java        | 10 ++++
 .../process/dao/mapper/ProcessTaskMapper.java |  2 +
 .../process/dao/mapper/ProcessTaskMapper.xml  | 10 ++++
 .../process/dto/ProcessTaskInvokeVo.java      | 49 +++++++++++++++++++
 .../process/dto/ProcessTaskStepVo.java        | 11 +++++
 .../core/ProcessStepHandlerBase.java          |  8 +++
 6 files changed, 90 insertions(+)
 create mode 100644 src/main/java/neatlogic/framework/process/dto/ProcessTaskInvokeVo.java

diff --git a/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java b/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java
index 9c6b5131..0773c5fc 100644
--- a/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java
+++ b/src/main/java/neatlogic/framework/process/constvalue/IProcessTaskSource.java
@@ -17,6 +17,7 @@ limitations under the License.
 package neatlogic.framework.process.constvalue;
 
 import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.process.dto.ProcessTaskStepVo;
 import neatlogic.framework.process.dto.ProcessTaskVo;
 
 /**
@@ -43,4 +44,13 @@ public interface IProcessTaskSource {
      */
     default void saveDraft(JSONObject paramObj, ProcessTaskVo processTaskVo){
     }
+
+    /**
+     * 保存工单会执行的操作
+     *
+     * @param processTaskStepVo 工单步骤对象
+     */
+    default void complete (ProcessTaskStepVo processTaskStepVo){
+
+    }
 }
diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
index ce6100ca..fbf85cf3 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
@@ -351,6 +351,8 @@ public interface ProcessTaskMapper {
 
     List<ProcessTaskVo> SearchSubProcessTaskListByStepId(Long processTaskStepId);
 
+    ProcessTaskInvokeVo getInvokeByProcessTaskId(Long processTaskId);
+
     int getSubProcessTaskCountByStepIdAndWithoutEndStatusList(@Param("processTaskStepId") Long processTaskStepId,@Param("statusList") List<String> statusList);
 
     int insertIgnoreProcessTaskConfig(ProcessTaskConfigVo processTaskConfigVo);
diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
index f77a17d0..33b766ee 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
@@ -2807,6 +2807,16 @@ limitations under the License.
             #{status}
         </foreach>
     </select>
+    <select id="getInvokeByProcessTaskId" resultType="neatlogic.framework.process.dto.ProcessTaskInvokeVo">
+        select
+            `processtask_id` as processTaskId,
+            `source`,
+            `type`,
+            `invoke_id` as invokeId
+        from `processtask_invoke`
+        where `processtask_id` = #{value}
+
+    </select>
 
     <!--<update id="updateProcessTaskStepConvergeIsCheck">
         UPDATE `processtask_converge`
diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskInvokeVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskInvokeVo.java
new file mode 100644
index 00000000..cd4bacec
--- /dev/null
+++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskInvokeVo.java
@@ -0,0 +1,49 @@
+package neatlogic.framework.process.dto;
+
+import neatlogic.framework.common.constvalue.ApiParamType;
+import neatlogic.framework.restful.annotation.EntityField;
+
+import java.io.Serializable;
+
+public class ProcessTaskInvokeVo implements Serializable {
+    @EntityField(name = "工单id", type = ApiParamType.LONG)
+    private Long processTaskId;
+    @EntityField(name = "来源", type = ApiParamType.STRING)
+    private String source;
+    @EntityField(name = "来源类型", type = ApiParamType.STRING)
+    private String type;
+    @EntityField(name = "来源id", type = ApiParamType.LONG)
+    private Long invokeId;
+
+    public Long getProcessTaskId() {
+        return processTaskId;
+    }
+
+    public void setProcessTaskId(Long processTaskId) {
+        this.processTaskId = processTaskId;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getInvokeId() {
+        return invokeId;
+    }
+
+    public void setInvokeId(Long invokeId) {
+        this.invokeId = invokeId;
+    }
+}
diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java
index 4c325a4e..516d64c2 100644
--- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java
+++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java
@@ -158,6 +158,9 @@ public class ProcessTaskStepVo extends BasePageVo {
     @EntityField(name = "标签列表", type = ApiParamType.JSONARRAY)
     private List<ProcessTagVo> processTagList;
 
+    @JSONField(serialize = false)
+    private Long parentProcessTaskStepId; //父工单步骤id
+
     public ProcessTaskStepVo() {
 
     }
@@ -824,4 +827,12 @@ public class ProcessTaskStepVo extends BasePageVo {
     public void setTaskConfigHash(String taskConfigHash) {
         this.taskConfigHash = taskConfigHash;
     }
+
+    public Long getParentProcessTaskStepId() {
+        return parentProcessTaskStepId;
+    }
+
+    public void setParentProcessTaskStepId(Long parentProcessTaskStepId) {
+        this.parentProcessTaskStepId = parentProcessTaskStepId;
+    }
 }
diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
index 8d65377a..865073c3 100644
--- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
+++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
@@ -888,6 +888,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
                     updateProcessTaskStepStatus(currentProcessTaskStepVo);
                     IProcessStepHandlerUtil.notify(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.COMPLETEPROCESSTASK);
                     IProcessStepHandlerUtil.action(currentProcessTaskStepVo, ProcessTaskNotifyTriggerType.COMPLETEPROCESSTASK);
+                    //根据工单来源执行额外操作
+                    ProcessTaskInvokeVo invokeVo = processTaskMapper.getInvokeByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId());
+                    if (invokeVo != null) {
+                        IProcessTaskSource processTaskSource = ProcessTaskSourceFactory.getHandler(invokeVo.getSource());
+                        if (processTaskSource != null) {
+                            processTaskSource.complete(currentProcessTaskStepVo);
+                        }
+                    }
                     ProcessTaskVo processTaskVo = processTaskMapper.getProcessTaskById(currentProcessTaskStepVo.getProcessTaskId());
                     if (Objects.equals(processTaskVo.getNeedScore(), 1)) {
                         ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo();
-- 
Gitee