From b10ea10cff14acfbbb0f56006e5cc1db5503b801 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Thu, 22 Feb 2024 17:44:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E6=95=B0=E6=8D=AE=E6=8A=BD=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1096897488453632]表单实例数据抽离 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1096897488453632
---
 .../IProcessTaskCrossoverService.java         | 12 ++-
 .../process/dao/mapper/ProcessTaskMapper.java | 16 +---
 .../process/dao/mapper/ProcessTaskMapper.xml  | 88 ++-----------------
 .../ProcessTaskAuditFormAttributeDataVo.java  | 16 ++--
 .../dto/ProcessTaskFormAttributeDataVo.java   | 36 ++++----
 .../core/ProcessStepHandlerBase.java          |  4 +-
 6 files changed, 50 insertions(+), 122 deletions(-)

diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java
index 76dde34c..49f48f7c 100644
--- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java
+++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java
@@ -21,10 +21,7 @@ import neatlogic.framework.dto.AuthenticationInfoVo;
 import neatlogic.framework.form.dto.FormAttributeVo;
 import neatlogic.framework.process.constvalue.ProcessTaskStatus;
 import neatlogic.framework.process.constvalue.ProcessTaskStepStatus;
-import neatlogic.framework.process.dto.AssignableWorkerStepVo;
-import neatlogic.framework.process.dto.ProcessCommentTemplateVo;
-import neatlogic.framework.process.dto.ProcessTaskStepVo;
-import neatlogic.framework.process.dto.ProcessTaskVo;
+import neatlogic.framework.process.dto.*;
 import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException;
 import com.alibaba.fastjson.JSONObject;
 
@@ -126,5 +123,12 @@ public interface IProcessTaskCrossoverService extends ICrossoverService {
      * @return 表单属性列表
      */
     List<FormAttributeVo> getFormAttributeListByProcessTaskId(Long processTaskId);
+
+    /**
+     * 根据工单id获取表单属性数据列表
+     * @param processTaskId 工单id
+     * @return
+     */
+    List<ProcessTaskFormAttributeDataVo> getProcessTaskFormAttributeDataListByProcessTaskId(Long processTaskId);
 }
 
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 a52cab72..9dbf94a5 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
@@ -72,13 +72,7 @@ public interface ProcessTaskMapper {
 
     List<ProcessTaskFormVo> getProcessTaskFormListByProcessTaskIdList(List<Long> existsProcessTaskIdList);
 
-    List<ProcessTaskFormAttributeDataVo> getProcessTaskStepFormAttributeDataByProcessTaskId(Long processTaskId);
-
-    List<ProcessTaskFormAttributeDataVo> getProcessTaskStepFormAttributeDataListByType(String type);
-
-    List<ProcessTaskFormAttributeDataVo> getProcessTaskFormAttributeDataListByProcessTaskIdAndFormType(@Param("processTaskId") Long processTaskId, @Param("type") String type);
-
-    List<ProcessTaskFormAttributeDataVo> getProcessTaskStepFormAttributeDataByProcessTaskIdList(List<Long> existsFormProcessTaskIdList);
+    List<Long> getProcessTaskFormAttributeDataIdListByProcessTaskId(Long processTaskId);
 
     List<ProcessTaskStepContentVo> getProcessTaskStepContentByProcessTaskStepId(Long processTaskStepId);
 
@@ -169,9 +163,6 @@ public interface ProcessTaskMapper {
 
     Set<Long> getProcessTaskIdSetByChannelUuidListAndAuthenticationInfo(@Param("channelUuidList") List<String> channelUuidList, @Param("authenticationInfoVo") AuthenticationInfoVo authenticationInfoVo);
 
-    ProcessTaskFormAttributeDataVo getProcessTaskFormAttributeDataByProcessTaskIdAndAttributeUuid(
-            ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo);
-
     int checkIsWorker(@Param("processTaskId") Long processTaskId,
                       @Param("processTaskStepId") Long processTaskStepId, @Param("userType") String userType,
                       @Param("authenticationInfoVo") AuthenticationInfoVo authenticationInfoVo);
@@ -408,8 +399,7 @@ public interface ProcessTaskMapper {
 //    int insertProcessTaskStepFormAttribute(
 //            ProcessTaskStepFormAttributeVo processTaskStepFormAttributeVo);
 
-    int insertProcessTaskFormAttributeData(
-            ProcessTaskFormAttributeDataVo processTaskFromAttributeDataVo);
+    int insertProcessTaskFormAttribute(ProcessTaskFormAttributeDataVo processTaskFromAttributeDataVo);
 
     int insertProcessTaskStepFile(ProcessTaskStepFileVo processTaskStepFileVo);
 
@@ -498,7 +488,7 @@ public interface ProcessTaskMapper {
 
     int updateProcessTaskIsDeletedById(@Param("id") Long id, @Param("isDeleted") Integer isDeleted);
 
-    int deleteProcessTaskFormAttributeDataByProcessTaskId(Long processTaskId);
+    int deleteProcessTaskFormAttributeByProcessTaskId(Long processTaskId);
 
     int deleteProcessTaskStepWorker(ProcessTaskStepWorkerVo processTaskStepWorkerVo);
 
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 fcc559bb..7f3addc3 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
@@ -314,56 +314,8 @@ limitations under the License.
         </foreach>
     </select>
 
-    <select id="getProcessTaskStepFormAttributeDataByProcessTaskId" parameterType="java.lang.Long"
-            resultType="neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo">
-        SELECT `processtask_id`  AS processTaskId,
-               `attribute_uuid`  AS attributeUuid,
-               `attribute_label` AS attributeLabel,
-               `type`            AS type,
-               `data`,
-               `sort`
-        FROM `processtask_formattribute_data`
-        WHERE `processtask_id` = #{value}
-    </select>
-
-    <select id="getProcessTaskStepFormAttributeDataListByType" parameterType="java.lang.String"
-            resultType="neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo">
-        SELECT `processtask_id`  AS processTaskId,
-               `attribute_uuid`  AS attributeUuid,
-               `attribute_label` AS attributeLabel,
-               `type`            AS type,
-               `data`,
-               `sort`
-        FROM `processtask_formattribute_data`
-        WHERE `type` = #{value}
-        ORDER BY `processtask_id`
-    </select>
-
-    <select id="getProcessTaskFormAttributeDataListByProcessTaskIdAndFormType"
-            resultType="neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo">
-        SELECT `processtask_id`  AS processTaskId,
-               `attribute_uuid`  AS attributeUuid,
-               `attribute_label` AS attributeLabel,
-               `type`            AS type,
-               `data`,
-               `sort`
-        FROM `processtask_formattribute_data`
-        WHERE `processtask_id` = #{processTaskId} AND `type` = #{type}
-    </select>
-
-    <select id="getProcessTaskStepFormAttributeDataByProcessTaskIdList" parameterType="java.util.List"
-            resultType="neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo">
-        SELECT `processtask_id` AS processTaskId,
-        `attribute_uuid` AS attributeUuid,
-        `attribute_label` AS attributeLabel,
-        `type` AS type,
-        `data`,
-        `sort`
-        FROM `processtask_formattribute_data`
-        WHERE `processtask_id` IN
-        <foreach collection="list" item="processTaskId" open="(" separator="," close=")">
-            #{processTaskId}
-        </foreach>
+    <select id="getProcessTaskFormAttributeDataIdListByProcessTaskId" parameterType="java.lang.Long" resultType="java.lang.Long">
+        SELECT `form_attribute_data_id` FROM `processtask_formattribute` WHERE `processtask_id` = #{value}
     </select>
 
     <select id="getProcessTaskStepContentByProcessTaskStepId" parameterType="java.lang.Long"
@@ -1122,20 +1074,6 @@ limitations under the License.
         </if>
     </select>
 
-    <select id="getProcessTaskFormAttributeDataByProcessTaskIdAndAttributeUuid"
-            parameterType="neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo"
-            resultType="neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo">
-        SELECT `processtask_id`  AS
-                                    processTaskId,
-               `type`,
-               `attribute_uuid`  AS attributeUuid,
-               `attribute_label` AS attributeLabel,
-               `data`
-        FROM `processtask_formattribute_data`
-        WHERE `processtask_id` = #{processTaskId}
-          AND `attribute_uuid` = #{attributeUuid}
-    </select>
-
     <select id="checkIsWorker" resultType="int">
         SELECT
         COUNT(1)
@@ -2993,22 +2931,10 @@ limitations under the License.
                 #{config})
     </insert>
 
-    <insert id="insertProcessTaskFormAttributeData"
+    <insert id="insertProcessTaskFormAttribute"
             parameterType="neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo">
-        INSERT INTO `processtask_formattribute_data` (`processtask_id`,
-                                                       `attribute_uuid`,
-                                                       `attribute_label`,
-                                                       `data`,
-                                                       `type`,
-                                                       `sort`)
-        VALUES (#{processTaskId},
-                #{attributeUuid},
-                #{attributeLabel},
-                #{data,typeHandler=CompressHandler},
-                #{type},
-                #{sort})
-        ON DUPLICATE KEY
-        UPDATE `data` = #{data,typeHandler=CompressHandler}
+        INSERT ignore INTO `processtask_formattribute` (`processtask_id`, `form_attribute_data_id`)
+        VALUES (#{processTaskId}, #{id})
     </insert>
 
     <insert id="insertIgnoreProcessTaskConverge" parameterType="neatlogic.framework.process.dto.ProcessTaskConvergeVo">
@@ -3764,9 +3690,9 @@ limitations under the License.
         WHERE `processtask_id` = #{value}
     </delete>
 
-    <delete id="deleteProcessTaskFormAttributeDataByProcessTaskId" parameterType="java.lang.Long">
+    <delete id="deleteProcessTaskFormAttributeByProcessTaskId" parameterType="java.lang.Long">
         DELETE
-        FROM `processtask_formattribute_data`
+        FROM `processtask_formattribute`
         WHERE `processtask_id` = #{value}
     </delete>
 
diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskAuditFormAttributeDataVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskAuditFormAttributeDataVo.java
index e775cb50..b873dfe0 100644
--- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskAuditFormAttributeDataVo.java
+++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskAuditFormAttributeDataVo.java
@@ -20,7 +20,7 @@ import neatlogic.framework.form.dto.AttributeDataVo;
 
 public class ProcessTaskAuditFormAttributeDataVo extends AttributeDataVo {
     private String type;
-    private Integer sort;
+//    private Integer sort;
     private Integer modified;
 
     public String getType() {
@@ -31,13 +31,13 @@ public class ProcessTaskAuditFormAttributeDataVo extends AttributeDataVo {
         this.type = type;
     }
 
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
+//    public Integer getSort() {
+//        return sort;
+//    }
+//
+//    public void setSort(Integer sort) {
+//        this.sort = sort;
+//    }
 
     public Integer getModified() {
         return modified;
diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskFormAttributeDataVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskFormAttributeDataVo.java
index 7f1bbd33..be39706a 100755
--- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskFormAttributeDataVo.java
+++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskFormAttributeDataVo.java
@@ -2,31 +2,37 @@ package neatlogic.framework.process.dto;
 
 import neatlogic.framework.form.dto.AttributeDataVo;
 
-public class ProcessTaskFormAttributeDataVo extends AttributeDataVo
-    implements Comparable<ProcessTaskFormAttributeDataVo> {
+public class ProcessTaskFormAttributeDataVo extends AttributeDataVo {
 //    @ESKey(type = ESKeyType.PKEY, name = "processTaskId")
     private Long processTaskId;
-    private Integer sort;
+//    private Integer sort;
 
-    public Long getProcessTaskId() {
-        return processTaskId;
-    }
+    public ProcessTaskFormAttributeDataVo() {}
 
-    public void setProcessTaskId(Long processTaskId) {
+    public ProcessTaskFormAttributeDataVo(Long processTaskId, AttributeDataVo attributeDataVo) {
         this.processTaskId = processTaskId;
+        this.setId(attributeDataVo.getId());
+        this.setFormUuid(attributeDataVo.getFormUuid());
+        this.setAttributeUuid(attributeDataVo.getAttributeUuid());
+        this.setAttributeLabel(attributeDataVo.getAttributeLabel());
+        this.setType(attributeDataVo.getType());
+        this.setData(attributeDataVo.getData());
     }
 
-    public Integer getSort() {
-        return sort;
+    public Long getProcessTaskId() {
+        return processTaskId;
     }
 
-    public void setSort(Integer sort) {
-        this.sort = sort;
+    public void setProcessTaskId(Long processTaskId) {
+        this.processTaskId = processTaskId;
     }
 
-    @Override
-    public int compareTo(ProcessTaskFormAttributeDataVo attributeData) {
-        return this.sort.compareTo(attributeData.getSort());
-    }
+//    public Integer getSort() {
+//        return sort;
+//    }
+//
+//    public void setSort(Integer sort) {
+//        this.sort = sort;
+//    }
 
 }
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 c7bd8dd5..a84e5b05 100644
--- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
+++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
@@ -40,6 +40,7 @@ import neatlogic.framework.notify.dao.mapper.NotifyMapper;
 import neatlogic.framework.notify.dto.NotifyPolicyVo;
 import neatlogic.framework.process.constvalue.*;
 import neatlogic.framework.process.crossover.IProcessCrossoverMapper;
+import neatlogic.framework.process.crossover.IProcessTaskCrossoverService;
 import neatlogic.framework.process.dao.mapper.*;
 import neatlogic.framework.process.dao.mapper.score.ProcessTaskScoreMapper;
 import neatlogic.framework.process.dao.mapper.score.ScoreTemplateMapper;
@@ -2019,7 +2020,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
             /* 保存描述内容和附件 **/
             IProcessStepHandlerUtil.saveContentAndFile(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_START);
             // 获取表单数据
-            List<ProcessTaskFormAttributeDataVo> processTaskFormAttributeDataList = processTaskMapper.getProcessTaskStepFormAttributeDataByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId());
+            IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class);
+            List<ProcessTaskFormAttributeDataVo> processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(currentProcessTaskStepVo.getProcessTaskId());
             if (CollectionUtils.isNotEmpty(processTaskFormAttributeDataList)) {
                 processTaskFormAttributeDataList.sort(ProcessTaskFormAttributeDataVo::compareTo);
                 JSONObject paramObj = currentProcessTaskStepVo.getParamObj();
-- 
Gitee


From bc9845c9a15c8452f73655ac0144d4be9d5789aa Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Thu, 22 Feb 2024 18:37:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E6=95=B0=E6=8D=AE=E6=8A=BD=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1096897488453632]表单实例数据抽离 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1096897488453632
---
 .../dto/ProcessTaskAuditFormAttributeDataVo.java | 16 ++++++++--------
 .../dto/ProcessTaskFormAttributeDataVo.java      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskAuditFormAttributeDataVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskAuditFormAttributeDataVo.java
index b873dfe0..174249a9 100644
--- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskAuditFormAttributeDataVo.java
+++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskAuditFormAttributeDataVo.java
@@ -19,17 +19,17 @@ package neatlogic.framework.process.dto;
 import neatlogic.framework.form.dto.AttributeDataVo;
 
 public class ProcessTaskAuditFormAttributeDataVo extends AttributeDataVo {
-    private String type;
+//    private String type;
 //    private Integer sort;
     private Integer modified;
 
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
+//    public String getHandler() {
+//        return type;
+//    }
+//
+//    public void setHandler(String type) {
+//        this.type = type;
+//    }
 
 //    public Integer getSort() {
 //        return sort;
diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskFormAttributeDataVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskFormAttributeDataVo.java
index be39706a..19737e18 100755
--- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskFormAttributeDataVo.java
+++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskFormAttributeDataVo.java
@@ -15,7 +15,7 @@ public class ProcessTaskFormAttributeDataVo extends AttributeDataVo {
         this.setFormUuid(attributeDataVo.getFormUuid());
         this.setAttributeUuid(attributeDataVo.getAttributeUuid());
         this.setAttributeLabel(attributeDataVo.getAttributeLabel());
-        this.setType(attributeDataVo.getType());
+        this.setHandler(attributeDataVo.getHandler());
         this.setData(attributeDataVo.getData());
     }
 
-- 
Gitee