From 423c2ad275471a5f40f936376425ea2842c3acd7 Mon Sep 17 00:00:00 2001
From: liukang <lukg6892>
Date: Wed, 28 Aug 2024 17:28:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=91=E5=B8=83=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=92=8C=E4=BD=BF=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/rzdata/web/domain/Tool.java      |  4 ++--
 .../src/main/resources/mapper/ToolMapper.xml           | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java b/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
index 850c3e9..89abbdc 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
@@ -81,8 +81,8 @@ public class Tool extends BaseEntity
     @Excel(name = "备注",sort=12)
     private String remark;
 
-    /** 发布时间 */
-    private String releaseTime;
+    /** 关联工具 */
+    private String association;
 
     private BpmClientInputModelBo bpmClientInputModel;
 
diff --git a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
index ac642bd..fff079c 100644
--- a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
+++ b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
@@ -40,7 +40,7 @@
     </resultMap>
 
     <sql id="selectToolVo">
-        select tool_id, tool_code, tool_name, tool_type, tool_source, tool_use, test_situation, function_desc, apply_condition, operate_explain, tool_principals, tool_principals_name, tool_resp_dept, status, remark, create_by, create_time, update_by, update_time,proc_inst_id,record_status from t_tool
+        select tool_id, tool_code, tool_name, tool_type, tool_source, tool_use, test_situation, function_desc, apply_condition, operate_explain, tool_principals, tool_principals_name, tool_resp_dept, status, remark, create_by, create_time, update_by, update_time,proc_inst_id,record_status,association from t_tool
     </sql>
 
     <select id="selectToolByToolId" parameterType="String" resultMap="ToolResult">
@@ -77,6 +77,7 @@
             <if test="updateTime != null">update_time,</if>
             <if test="procInstId != null">proc_inst_id,</if>
             <if test="recordStatus != null">record_status,</if>
+            <if test="association != null">association,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="toolId != null">#{toolId},</if>
@@ -100,6 +101,7 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="procInstId != null">#{procInstId},</if>
             <if test="recordStatus != null">#{recordStatus},</if>
+            <if test="association != null">#{association},</if>
         </trim>
     </insert>
 
@@ -125,6 +127,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="recordStatus != null">record_status = #{recordStatus},</if>
+            <if test="association != null">association = #{association},</if>
         </trim>
         where tool_id = #{toolId}
     </update>
@@ -142,7 +145,7 @@
 
     <select id="selectToolList" parameterType="Tool" resultMap="ToolResult">
         select u.tool_id, u.tool_code, u.tool_name, u.tool_type, u.tool_source, u.tool_use, u.test_situation, u.function_desc, u.apply_condition, u.operate_explain,u.record_status,u.proc_inst_id,
-               u.tool_principals, u.tool_principals_name, u.tool_resp_dept, u.status, u.create_by, u.create_time, u.remark, d.dept_name as tool_resp_dept_name from t_tool u
+               u.tool_principals, u.tool_principals_name, u.tool_resp_dept, u.status, u.create_by, u.create_time, u.remark, d.dept_name as tool_resp_dept_name,u.association from t_tool u
         left join sys_dept d on u.tool_resp_dept = d.dept_id
         where 1=1
         and u.record_status != 'cancel'
@@ -170,6 +173,9 @@
         <if test="createBy != null and createBy != '' and permission != true">
             AND (u.create_by = #{createBy} or u.record_status = 'done')
         </if>
+        <if test="recordStatus != null and recordStatus != ''">
+            AND u.record_status = #{recordStatus}
+        </if>
         order by create_time desc
     </select>