From bc38b6767e375c5c93eae4b100ba5dbc133b3574 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Fri, 27 Sep 2024 15:32:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B7=A5=E5=85=B7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E3=80=90=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=81=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E3=80=81=E8=81=94=E7=B3=BB=E4=BA=BA=E3=80=81=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=91=20=E4=BF=AE=E6=94=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E2=80=9C=E5=BD=92=E5=B1=9E=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E2=80=9D=E4=BF=AE=E6=94=B9=E4=B8=BA=E3=80=90=E5=BD=92=E5=B1=9E?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E3=80=91=EF=BC=8C=E2=80=9C=E2=80=9D=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=83=85=E5=86=B5=E2=80=9C=E2=80=9D=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E3=80=90=E6=B5=8B=E8=AF=84=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E3=80=91=E3=80=81=E2=80=9C=E5=8A=9F=E8=83=BD=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E2=80=9D=E4=BF=AE=E6=94=B9=E4=B8=BA=E3=80=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=AE=80=E4=BB=8B=E3=80=91=E3=80=81=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E4=B8=BA=E3=80=90=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=BD=A2=E6=80=81=E3=80=91=20=E6=B6=89=E5=8F=8A?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=20=E5=B7=A5=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=9A=E5=B7=A5=E5=85=B7=E5=8F=91=E5=B8=83=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E6=8F=90=E4=BA=A4=E3=80=81=E6=9A=82?=
 =?UTF-8?q?=E5=AD=98=E3=80=81=E5=85=A8=E9=87=8F=E5=AF=BC=E5=87=BA=E3=80=81?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=87=BA=E3=80=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=202.word=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=89=B9=E9=87=8F=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=9C=AA=E6=8C=89=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/tool/ToolController.java   |  2 +-
 .../main/java/com/rzdata/web/domain/Tool.java | 36 ++++++++++++-------
 .../src/main/resources/mapper/ToolMapper.xml  | 20 +++++++++--
 3 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
index c891f71..0e84590 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
@@ -103,7 +103,7 @@ public class ToolController extends BaseController
     @Log(title = "工具信息", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('tool:list')")
     @PostMapping("/export/word/list")
-    public AjaxResult exportWordList(Tool tool)
+    public AjaxResult exportWordList(@RequestBody Tool tool)
     {
         List<Tool> list = toolService.selectAllList(tool);
         return AjaxResult.success(list);
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 a025295..d8e7522 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
@@ -24,36 +24,37 @@ public class Tool extends BaseEntity
     private String toolId;
 
     /** 工具编号 */
+    @Excel(name = "编号",sort=1)
     private String toolCode;
 
     /** 工具名称 */
-    @Excel(name = "工具名称",sort=1)
+    @Excel(name = "中文别名",sort=2)
     private String toolName;
 
     /** 工具类别 */
-    @Excel(name = "工具类别",dictType="tool_type",sort=2)
+    @Excel(name = "类别",dictType="tool_type",sort=5)
     private String toolType;
 
     /** 来源 */
-    @Excel(name = "工具来源",dictType="tool_source",sort=3)
+    @Excel(name = "来源",dictType="tool_source",sort=3)
     private String toolSource;
 
     private String toolSourceName;
 
     /** 用途 */
-    //@Excel(name = "工具用途",sort=7)
+    @Excel(name = "用途",sort=6)
     private String toolUse;
 
     /** 测试情况 */
-    //@Excel(name = "测评情况",sort=8)
+    @Excel(name = "测评机构",sort=7)
     private String testSituation;
 
     /** 功能描述 */
-    //@Excel(name = "功能描述",sort=9)
+    @Excel(name = "功能简介",sort=8)
     private String functionDesc;
 
     /** 适用条件 */
-    //@Excel(name = "适用条件",sort=10)
+    @Excel(name = "适用条件",sort=9)
     private String applyCondition;
 
     /** 操作说明 */
@@ -70,15 +71,27 @@ public class Tool extends BaseEntity
     /** 归属单位 */
     private String toolRespDept;
 
-    @Excel(name = "归属单位",sort=5)
+    @Excel(name = "归属单位",sort=12)
     private String toolRespDeptName;
 
+    @Excel(name = "加密方式",sort=10)
+    private String encryptionMode;
+
+    @Excel(name = "服务时间",sort=11)
+    private String serviceTime;
+
+    @Excel(name = "联系人",sort=13)
+    private String contactPerson;
+
+    @Excel(name = "联系方式",sort=14)
+    private String contactPhone;
+
     /** 状态 */
-    @Excel(name = "状态",dictType="tool_status",sort=6)
+    @Excel(name = "形态",dictType="tool_status",sort=4)
     private String status;
 
     /** 备注 */
-    //@Excel(name = "备注",sort=12)
+    @Excel(name = "备注",sort=15)
     private String remark;
 
     /** 关联工具 */
@@ -87,12 +100,11 @@ public class Tool extends BaseEntity
     private BpmClientInputModelBo bpmClientInputModel;
 
     /** done：办结，doing：进行中**/
-    @Excel(name = "流程状态",dictType="flow_status",sort=7)
     private String recordStatus;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "创建时间", dateFormat="yyyy-MM-dd")
+    @Excel(name = "创建时间", dateFormat="yyyy-MM-dd",sort=16)
     private Date createTime;
 
     private Boolean editStatus;
diff --git a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
index 143b10a..d6043a4 100644
--- a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
+++ b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
@@ -19,6 +19,10 @@
         <result property="toolPrincipalsName"    column="tool_principals_name"    />
         <result property="toolRespDept"    column="tool_resp_dept"    />
         <result property="toolRespDeptName"    column="tool_resp_dept_name"    />
+        <result property="encryptionMode"    column="encryption_mode"    />
+        <result property="serviceTime"    column="service_time"    />
+        <result property="contactPerson"    column="contact_person"    />
+        <result property="contactPhone"    column="contact_phone"    />
         <result property="status"    column="status"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
@@ -40,7 +44,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,association 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, encryption_mode, service_time, contact_person, contact_phone, 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">
@@ -69,6 +73,10 @@
             <if test="toolPrincipals != null">tool_principals,</if>
             <if test="toolPrincipalsName != null">tool_principals_name,</if>
             <if test="toolRespDept != null">tool_resp_dept,</if>
+            <if test="encryptionMode != null">encryption_mode,</if>
+            <if test="serviceTime != null">service_time,</if>
+            <if test="contactPerson != null">contact_person,</if>
+            <if test="contactPhone != null">contact_phone,</if>
             <if test="status != null">status,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
@@ -93,6 +101,10 @@
             <if test="toolPrincipals != null">#{toolPrincipals},</if>
             <if test="toolPrincipalsName != null">#{toolPrincipalsName},</if>
             <if test="toolRespDept != null">#{toolRespDept},</if>
+            <if test="encryptionMode != null">#{encryptionMode},</if>
+            <if test="serviceTime != null">#{serviceTime},</if>
+            <if test="contactPerson != null">#{contactPerson},</if>
+            <if test="contactPhone != null">#{contactPhone},</if>
             <if test="status != null">#{status},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -120,6 +132,10 @@
             <if test="toolPrincipals != null">tool_principals = #{toolPrincipals},</if>
             <if test="toolPrincipalsName != null">tool_principals_name = #{toolPrincipalsName},</if>
             <if test="toolRespDept != null">tool_resp_dept = #{toolRespDept},</if>
+            <if test="encryptionMode != null">encryption_mode = #{encryptionMode},</if>
+            <if test="serviceTime != null">service_time = #{serviceTime},</if>
+            <if test="contactPerson != null">contact_person = #{contactPerson},</if>
+            <if test="contactPhone != null">contact_phone = #{contactPhone},</if>
             <if test="status != null">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -144,7 +160,7 @@
     </select>
 
     <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,
+        select u.tool_id, u.tool_code, u.tool_name, u.tool_type, u.tool_source, u.encryption_mode, u.service_time, u.contact_person, u.contact_phone, 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,u.association
         from t_tool u
         left join sys_user su on u.create_by = su.user_id