From 8ee024d8d87749262fe7270b960dbfd95ee8f0c1 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 20 Aug 2024 10:26:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E5=AF=86=E5=93=81?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/property/property/add.html       |  9 +++++++++
 .../templates/system/property/property/edit.html      |  9 ++++++++-
 .../templates/system/property/property/property.html  |  8 ++++++++
 .../com/ruoyi/system/domain/TdPropertyManager.java    | 11 ++++++++++-
 .../mapper/system/TdPropertyManagerMapper.xml         |  7 ++++++-
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
index 7f7877c..8e8fa9f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
@@ -80,6 +80,15 @@
                     </div>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required ">密品分类：</label>
+                <div class="col-sm-8">
+                    <select name="secretsType" required class="form-control m-b" th:with="type=${@dict.getType('sys_secrets_type')}">
+                        <option value="">请选择</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">密品数量：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
index 0797e68..a63d909 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
@@ -87,7 +87,14 @@
                     </div>
                 </div>
             </div>
-
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">密品分类：</label>
+                <div class="col-sm-8">
+                    <select name="secretsType"  class="form-control m-b" th:with="type=${@dict.getType('sys_secrets_type')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  th:field="*{secretsType}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">密品数量：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html
index ab290f3..0220437 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html
@@ -60,6 +60,7 @@
         var editFlag = [[${@permission.hasPermi('system:property:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:property:remove')}]];
         var listFlag = [[${@permission.hasPermi('system:property:list')}]];
+        var sysSecretsTypeDatas = [[${@dict.getType('sys_secrets_type')}]];
         var prefix = ctx + "system/property";
         let datas = []
         $.ajax({
@@ -99,6 +100,13 @@
                         return getCity(datas, value)
                     }
                 },
+                {
+                    field: 'secretsType',
+                    title: '密品分类',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(sysSecretsTypeDatas, value);
+                    }
+                },
                 {
                     field: 'useDepart',
                     title: '使用部门'
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java
index e7e116a..2b133af 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java
@@ -68,7 +68,7 @@ public class TdPropertyManager extends BaseEntity
     private Long propertyNum;
 
 
-    @Excel(name = "所属区县")
+    @Excel(name = "密品类型" ,readConverterExp = "1=涉密信息设备,2=涉密设备")
     private String secretsType;
 
 
@@ -182,6 +182,14 @@ public class TdPropertyManager extends BaseEntity
         return propertyNum;
     }
 
+    public String getSecretsType() {
+        return secretsType;
+    }
+
+    public void setSecretsType(String secretsType) {
+        this.secretsType = secretsType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -197,6 +205,7 @@ public class TdPropertyManager extends BaseEntity
                 .append("part", getPart())
                 .append("areaId", getAreaId())
                 .append("propertyNum", getPropertyNum())
+                .append("secretsType", getSecretsType())
                 .toString();
     }
 }
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml
index e862119..e79c4be 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml
@@ -17,10 +17,11 @@
         <result property="part"    column="part"    />
         <result property="areaId"    column="area_id"    />
         <result property="propertyNum"    column="property_num"    />
+        <result property="secretsType"    column="secrets_type"    />
     </resultMap>
 
     <sql id="selectTdPropertyManagerVo">
-        select use_id, use_depart, user_name, use_date, framework_id, recover_depart, recover_name, recover_date, shemichengdu, part, area_id, property_num from td_property_manager
+        select use_id, use_depart, user_name, use_date, framework_id, recover_depart, recover_name, recover_date, shemichengdu, part, area_id, property_num,secrets_type from td_property_manager
     </sql>
 
     <select id="selectTdPropertyManagerList" parameterType="TdPropertyManager" resultMap="TdPropertyManagerResult">
@@ -38,6 +39,7 @@
             <if test="part != null  and part != ''"> and part = #{part}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
             <if test="propertyNum != null "> and property_num = #{propertyNum}</if>
+            <if test="secretsType != null "> and secrets_type = #{secretsType}</if>
         </where>
     </select>
 
@@ -61,6 +63,7 @@
             <if test="part != null">part,</if>
             <if test="areaId != null">area_id,</if>
             <if test="propertyNum != null">property_num,</if>
+            <if test="secretsType != null">secrets_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="useId != null">#{useId},</if>
@@ -75,6 +78,7 @@
             <if test="part != null">#{part},</if>
             <if test="areaId != null">#{areaId},</if>
             <if test="propertyNum != null">#{propertyNum},</if>
+            <if test="secretsType != null">#{secretsType},</if>
         </trim>
     </insert>
 
@@ -92,6 +96,7 @@
             <if test="part != null">part = #{part},</if>
             <if test="areaId != null">area_id = #{areaId},</if>
             <if test="propertyNum != null">property_num = #{propertyNum},</if>
+            <if test="secretsType != null">secrets_type = #{secretsType},</if>
         </trim>
         where use_id = #{useId}
     </update>