From aaeeccfff22fc2930e9aaaa54205de5be6ad651b Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 13 May 2024 17:45:54 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=89=A9=E5=B1=95=E5=B1=9E=E6=80=A7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEformExtendConfig=E6=94=BE=E5=9C=A8=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AEformConfig=E5=86=85=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1155818207019008]后端-表单扩展属性配置formExtendConfig放在表单配置formConfig内部 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1155818207019008
---
 .../mapper/processtask/ProcessTaskMapper.java |  4 --
 .../mapper/processtask/ProcessTaskMapper.xml  | 47 -------------------
 .../service/ProcessStepHandlerUtil.java       | 23 +++++----
 .../service/ProcessTaskServiceImpl.java       | 14 +++---
 .../changelog/2024-04-24/neatlogic_tenant.sql | 13 -----
 .../resources/process/sqlscript/ddl.sql       | 14 ------
 6 files changed, 20 insertions(+), 95 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java
index 61513919d..c26a008fd 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java
+++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java
@@ -73,8 +73,6 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper {
 
     ProcessTaskFormVo getProcessTaskFormByProcessTaskId(Long processTaskId);
 
-    List<ProcessTaskFormAttributeVo> getProcessTaskFormExtendAttributeListByProcessTaskIdAndTag(@Param("processTaskId") Long processTaskId, @Param("tag") String tag);
-
     List<ProcessTaskFormVo> getProcessTaskFormListByProcessTaskIdList(List<Long> existsProcessTaskIdList);
 
     List<Long> getProcessTaskFormAttributeDataIdListByProcessTaskId(Long processTaskId);
@@ -469,8 +467,6 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper {
 
     int insertProcessTaskInvoke(@Param("processTaskId") Long processTaskId, @Param("source") String invoke, @Param("sourceType") String invokeType, @Param("invokeId") Long invokeId);
 
-    int insertProcessTaskFormExtendAttribute(ProcessTaskFormAttributeVo processTaskFormAttributeVo);
-
     int updateProcessTaskStepStatus(ProcessTaskStepVo processTaskStepVo);
 
     int updateProcessTaskStatus(ProcessTaskVo processTaskVo);
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml
index db68965eb..cd2dd3f4b 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml
+++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml
@@ -302,25 +302,6 @@
         WHERE a.`processtask_id` = #{value}
     </select>
 
-    <select id="getProcessTaskFormExtendAttributeListByProcessTaskIdAndTag" parameterType="java.util.HashMap" resultType="neatlogic.framework.process.dto.ProcessTaskFormAttributeVo">
-        SELECT
-            `processtask_id` AS processTaskId,
-            `form_uuid` AS formUuid,
-            `parent_uuid` AS parentUuid,
-            `tag`,
-            `key`,
-            `uuid`,
-            `label`,
-            `type`,
-            `handler`,
-            `config_hash` AS configHash
-        FROM `processtask_form_extend_attribute`
-        WHERE `processtask_id` = #{processTaskId}
-          <if test="tag != null">
-              AND `tag` = #{tag}
-          </if>
-    </select>
-
     <select id="getProcessTaskFormListByProcessTaskIdList" parameterType="java.util.List"
             resultType="neatlogic.framework.process.dto.ProcessTaskFormVo">
         SELECT a.`processtask_id` as processTaskId,
@@ -3651,34 +3632,6 @@
         VALUES (#{processTaskId}, #{source}, #{sourceType}, #{invokeId});
     </insert>
 
-    <insert id="insertProcessTaskFormExtendAttribute" parameterType="neatlogic.framework.process.dto.ProcessTaskFormAttributeVo">
-        INSERT INTO `processtask_form_extend_attribute` (
-            `processtask_id`,
-            `form_uuid`,
-            `parent_uuid`,
-            `tag`,
-            `key`,
-            `uuid`,
-            `label`,
-            `type`,
-            `handler`,
-            `config_hash`
-        )
-        VALUES
-            (
-                #{processTaskId},
-                #{formUuid},
-                #{parentUuid},
-                #{tag},
-                #{key},
-                #{uuid},
-                #{label},
-                #{type},
-                #{handler},
-                #{configHash}
-            )
-    </insert>
-
     <update id="updateProcessTaskStepUserStatus" parameterType="neatlogic.framework.process.dto.ProcessTaskStepUserVo">
         UPDATE
         `processtask_step_user`
diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java
index ca945b914..33b4a6c5f 100644
--- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java
@@ -860,7 +860,8 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess
             readcomponentList = readcomponentArray.toJavaList(String.class);
         }
 
-        List<FormAttributeVo> defaultSceneFormAttributeList;
+        Map<String, FormAttributeVo> formExtendAttributeMap = new HashMap<>();
+                List<FormAttributeVo> defaultSceneFormAttributeList;
         String formContent = selectContentByHashMapper.getProcessTaskFromContentByHash(processTaskFormVo.getFormContentHash());
         {
             // 默认场景的表单
@@ -871,6 +872,10 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess
             /* 校验表单属性是否合法 **/
             FormUtil.formAttributeValueValid(formVersionVo, formAttributeDataList);
             defaultSceneFormAttributeList = formVersionVo.getFormAttributeList();
+            List<FormAttributeVo> formExtendAttributeList = formVersionVo.getFormExtendAttributeList();
+            if (CollectionUtils.isNotEmpty(formExtendAttributeList)) {
+                formExtendAttributeMap = formExtendAttributeList.stream().collect(Collectors.toMap(e -> e.getParentUuid() + "#" + e.getTag() + "#" + e.getKey(), e -> e));
+            }
         }
         if (CollectionUtils.isEmpty(defaultSceneFormAttributeList)) {
             return;
@@ -999,8 +1004,6 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess
         Map<String, AttributeDataVo> oldExtendAttributeDataMap = oldExtendAttributeDataList.stream().collect(Collectors.toMap(AttributeDataVo::getAttributeUuid, e -> e));
         JSONArray formExtendAttributeDataList = paramObj.getJSONArray("formExtendAttributeDataList");
         if (CollectionUtils.isNotEmpty(formExtendAttributeDataList)) {
-            List<ProcessTaskFormAttributeVo> processTaskFormExtendAttributeList = processTaskMapper.getProcessTaskFormExtendAttributeListByProcessTaskIdAndTag(processTaskId, null);
-            Map<String, ProcessTaskFormAttributeVo> processTaskFormExtendAttributeMap = processTaskFormExtendAttributeList.stream().collect(Collectors.toMap(e -> e.getParentUuid() + "#" + e.getTag() + "#" + e.getKey(), e -> e));
             for (int j = 0; j < formExtendAttributeDataList.size(); j++) {
                 JSONObject formExtendAttributeDataObj = formExtendAttributeDataList.getJSONObject(j);
                 if (MapUtils.isEmpty(formExtendAttributeDataObj)) {
@@ -1009,21 +1012,21 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess
                 String parentUuid = formExtendAttributeDataObj.getString("parentUuid");
                 String tag = formExtendAttributeDataObj.getString("tag");
                 String key = formExtendAttributeDataObj.getString("key");
-                ProcessTaskFormAttributeVo processTaskFormAttributeVo = processTaskFormExtendAttributeMap.get(parentUuid + "#" + tag + "#" + key);
-                if (processTaskFormAttributeVo == null) {
+                FormAttributeVo formAttributeVo = formExtendAttributeMap.get(parentUuid + "#" + tag + "#" + key);
+                if (formAttributeVo == null) {
                     continue;
                 }
                 String dataList = formExtendAttributeDataObj.getString("dataList");
                 ProcessTaskFormAttributeDataVo processTaskExtendFormAttributeDataVo = new ProcessTaskFormAttributeDataVo();
-                AttributeDataVo oldAttributeDataVo = oldExtendAttributeDataMap.get(processTaskFormAttributeVo.getUuid());
+                AttributeDataVo oldAttributeDataVo = oldExtendAttributeDataMap.get(formAttributeVo.getUuid());
                 if (oldAttributeDataVo != null) {
                     processTaskExtendFormAttributeDataVo.setId(oldAttributeDataVo.getId());
                 }
-                processTaskExtendFormAttributeDataVo.setFormUuid(processTaskFormAttributeVo.getFormUuid());
-                processTaskExtendFormAttributeDataVo.setHandler(processTaskFormAttributeVo.getHandler());
+                processTaskExtendFormAttributeDataVo.setFormUuid(formAttributeVo.getFormUuid());
+                processTaskExtendFormAttributeDataVo.setHandler(formAttributeVo.getHandler());
                 processTaskExtendFormAttributeDataVo.setTag(tag);
-                processTaskExtendFormAttributeDataVo.setAttributeUuid(processTaskFormAttributeVo.getUuid());
-                processTaskExtendFormAttributeDataVo.setAttributeLabel(processTaskFormAttributeVo.getLabel());
+                processTaskExtendFormAttributeDataVo.setAttributeUuid(formAttributeVo.getUuid());
+                processTaskExtendFormAttributeDataVo.setAttributeLabel(formAttributeVo.getLabel());
                 processTaskExtendFormAttributeDataVo.setData(dataList);
                 formMapper.insertFormExtendAttributeData(processTaskExtendFormAttributeDataVo);
                 processTaskExtendFormAttributeDataVo.setProcessTaskId(processTaskId);
diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
index 358111f60..b11bfad9b 100644
--- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
@@ -2113,13 +2113,13 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC
             return formAttributeList;
         }
         List<String> parentUuidList = new ArrayList<>();
-        List<FormAttributeVo> formExtendAttributeList = new ArrayList<>();
-        List<ProcessTaskFormAttributeVo> processTaskFormExtendAttributeList = processTaskMapper.getProcessTaskFormExtendAttributeListByProcessTaskIdAndTag(processTaskId, tag);
-        for (ProcessTaskFormAttributeVo processTaskFormAttributeVo : processTaskFormExtendAttributeList) {
-            parentUuidList.add(processTaskFormAttributeVo.getParentUuid());
-            String configStr = selectContentByHashMapper.getProcessTaskFromContentByHash(processTaskFormAttributeVo.getConfigHash());
-            processTaskFormAttributeVo.setConfig(JSON.parseObject(configStr));
-            formExtendAttributeList.add(processTaskFormAttributeVo);
+        List<FormAttributeVo> formExtendAttributeList = formVersionVo.getFormExtendAttributeList();
+        List<FormAttributeVo> allFormExtendAttributeList = formVersionVo.getFormExtendAttributeList();
+        for (FormAttributeVo formAttributeVo : allFormExtendAttributeList) {
+            if (Objects.equals(formAttributeVo.getTag(), tag)) {
+                parentUuidList.add(formAttributeVo.getParentUuid());
+                formExtendAttributeList.add(formAttributeVo);
+            }
         }
         for (FormAttributeVo formAttributeVo : formAttributeList) {
             if (parentUuidList.contains(formAttributeVo.getUuid())) {
diff --git a/src/main/resources/neatlogic/resources/process/changelog/2024-04-24/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/process/changelog/2024-04-24/neatlogic_tenant.sql
index 9c1c43355..0d8a80d98 100644
--- a/src/main/resources/neatlogic/resources/process/changelog/2024-04-24/neatlogic_tenant.sql
+++ b/src/main/resources/neatlogic/resources/process/changelog/2024-04-24/neatlogic_tenant.sql
@@ -5,16 +5,3 @@ CREATE TABLE `processtask_extend_formattribute` (
     PRIMARY KEY (`processtask_id`,`form_attribute_data_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='工单与表单扩展属性值关系表';
 
-CREATE TABLE `processtask_form_extend_attribute` (
-    `processtask_id` bigint NOT NULL COMMENT '工单id',
-    `form_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单uuid',
-    `parent_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性父级uuid',
-    `tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标签',
-    `key` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性key',
-    `uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性uuid',
-    `label` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性名',
-    `type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性类型，系统属性不允许修改',
-    `handler` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性处理器',
-    `config_hash` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性配置Hash值',
-    PRIMARY KEY (`processtask_id`,`form_uuid`,`tag`,`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='工单表单版本扩展属性';
diff --git a/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql b/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql
index 921526a82..fc38f644c 100644
--- a/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql
+++ b/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql
@@ -1422,17 +1422,3 @@ CREATE TABLE IF NOT EXISTS `processtask_extend_formattribute` (
     `tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标签',
     PRIMARY KEY (`processtask_id`,`form_attribute_data_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='工单与表单扩展属性值关系表';
-
-CREATE TABLE IF NOT EXISTS `processtask_form_extend_attribute` (
-    `processtask_id` bigint NOT NULL COMMENT '工单id',
-    `form_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单uuid',
-    `parent_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性父级uuid',
-    `tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标签',
-    `key` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性key',
-    `uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性uuid',
-    `label` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性名',
-    `type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性类型，系统属性不允许修改',
-    `handler` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性处理器',
-    `config_hash` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性配置Hash值',
-    PRIMARY KEY (`processtask_id`,`form_uuid`,`tag`,`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='工单表单版本扩展属性';
\ No newline at end of file
-- 
Gitee