From 99cf3b7a040069d98a16b2eb1e8ba0fa38c47056 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 24 Apr 2024 18:23:31 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1141293256769536]后端-自定义表单标准规范定义 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1141293256769536
---
 .../IProcessTaskCrossoverService.java         | 16 ++++++++++++++++
 .../process/dao/mapper/ProcessTaskMapper.java |  4 +++-
 .../process/dao/mapper/ProcessTaskMapper.xml  | 19 +++++++++++++++++--
 .../framework/process/dto/ActionVo.java       |  9 +++++++++
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java
index 34ff01b1..8f3f9c2a 100644
--- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java
+++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java
@@ -123,11 +123,27 @@ public interface IProcessTaskCrossoverService extends ICrossoverService {
      */
     List<FormAttributeVo> getFormAttributeListByProcessTaskId(Long processTaskId);
 
+    /**
+     * 根据工单id获取工单绑定的表单信息
+     * @param processTaskId 工单ID
+     * @param tag 标签
+     * @return
+     */
+    List<FormAttributeVo> getFormAttributeListByProcessTaskIdAngTag(Long processTaskId, String tag);
+
     /**
      * 根据工单id获取表单属性数据列表
      * @param processTaskId 工单id
      * @return
      */
     List<ProcessTaskFormAttributeDataVo> getProcessTaskFormAttributeDataListByProcessTaskId(Long processTaskId);
+
+    /**
+     * 根据工单id获取表单属性数据列表
+     * @param processTaskId 工单id
+     * @param tag 标签
+     * @return
+     */
+    List<ProcessTaskFormAttributeDataVo> getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(Long processTaskId, String tag);
 }
 
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 1186a387..60697588 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java
@@ -70,12 +70,14 @@ public interface ProcessTaskMapper {
 
     ProcessTaskFormVo getProcessTaskFormByProcessTaskId(Long processTaskId);
 
-    List<ProcessTaskFormAttributeVo> getProcessTaskFormExtendAttributeListByProcessTaskId(Long processTaskId);
+    List<ProcessTaskFormAttributeVo> getProcessTaskFormExtendAttributeListByProcessTaskIdAndTag(@Param("processTaskId") Long processTaskId, @Param("tag") String tag);
 
     List<ProcessTaskFormVo> getProcessTaskFormListByProcessTaskIdList(List<Long> existsProcessTaskIdList);
 
     List<Long> getProcessTaskFormAttributeDataIdListByProcessTaskId(Long processTaskId);
 
+    List<AttributeDataVo> getProcessTaskFormAttributeDataListByProcessTaskId(Long processTaskId);
+
     List<Long> getProcessTaskExtendFormAttributeDataIdListByProcessTaskId(Long processTaskId);
 
     List<AttributeDataVo> getProcessTaskExtendFormAttributeDataListByProcessTaskId(@Param("processTaskId") Long processTaskId, @Param("tag") String tag);
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 7fcdde19..ea8df3b8 100644
--- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
+++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml
@@ -300,7 +300,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         WHERE a.`processtask_id` = #{value}
     </select>
 
-    <select id="getProcessTaskFormExtendAttributeListByProcessTaskId" parameterType="java.lang.Long" resultType="neatlogic.framework.process.dto.ProcessTaskFormAttributeVo">
+    <select id="getProcessTaskFormExtendAttributeListByProcessTaskIdAndTag" parameterType="java.util.HashMap" resultType="neatlogic.framework.process.dto.ProcessTaskFormAttributeVo">
         SELECT
             `processtask_id` AS processTaskId,
             `form_uuid` AS formUuid,
@@ -313,7 +313,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             `handler`,
             `config_hash` AS configHash
         FROM `processtask_form_extend_attribute`
-        WHERE `processtask_id` = #{value}
+        WHERE `processtask_id` = #{processTaskId}
+          <if test="tag != null">
+              AND `tag` = #{tag}
+          </if>
     </select>
 
     <select id="getProcessTaskFormListByProcessTaskIdList" parameterType="java.util.List"
@@ -333,6 +336,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         SELECT `form_attribute_data_id` FROM `processtask_formattribute` WHERE `processtask_id` = #{value}
     </select>
 
+    <select id="getProcessTaskFormAttributeDataListByProcessTaskId" parameterType="java.lang.Long" resultType="neatlogic.framework.form.dto.AttributeDataVo">
+        SELECT a.`id`,
+               a.`form_uuid`       AS formUuid,
+               a.`handler`,
+               a.`attribute_label` AS attributeLabel,
+               a.`attribute_uuid`  AS attributeUuid,
+               a.`data`
+        FROM `form_attribute_data` a
+                 join processtask_formattribute b on a.id = b.form_attribute_data_id
+        where b.processtask_id = #{value}
+    </select>
+
     <select id="getProcessTaskExtendFormAttributeDataIdListByProcessTaskId" parameterType="java.lang.Long" resultType="java.lang.Long">
         SELECT `form_attribute_data_id` FROM `processtask_extend_formattribute` WHERE `processtask_id` = #{value}
     </select>
diff --git a/src/main/java/neatlogic/framework/process/dto/ActionVo.java b/src/main/java/neatlogic/framework/process/dto/ActionVo.java
index 1e6300ff..24d3eba4 100755
--- a/src/main/java/neatlogic/framework/process/dto/ActionVo.java
+++ b/src/main/java/neatlogic/framework/process/dto/ActionVo.java
@@ -10,6 +10,7 @@ public class ActionVo {
 	private String integrationName;
 	private boolean isSucceed;
 	private String statusText;
+	private String error;
 	public Long getProcessTaskStepId() {
 		return processTaskStepId;
 	}
@@ -58,4 +59,12 @@ public class ActionVo {
 	public void setStatusText(String statusText) {
 		this.statusText = statusText;
 	}
+
+	public String getError() {
+		return error;
+	}
+
+	public void setError(String error) {
+		this.error = error;
+	}
 }
-- 
Gitee