From 3bd43a964a4a11084ad009676df115b15ca49a7b Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Tue, 22 Mar 2022 10:36:58 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=8F=82=E6=95=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=E3=80=81=E6=8E=92=E5=BA=8F=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/base/sysParamConfig/add.html    | 14 ++++++++++++
 .../templates/base/sysParamConfig/edit.html   | 14 ++++++++++++
 .../base/sysParamConfig/sysParamConfig.html   | 11 +++++++++-
 .../ruoyi/system/domain/SysParamConfig.java   | 22 +++++++++++++++++++
 .../mapper/system/SysParamConfigMapper.xml    | 11 +++++++++-
 5 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/add.html b/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/add.html
index 5b1f6bb..aa0b8ad 100644
--- a/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/add.html
+++ b/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/add.html
@@ -25,6 +25,20 @@
                 </div>
             </div>
             <div class="form-group">    
+                <label class="col-sm-3 control-label">是否显示：</label>
+                <div class="col-sm-8">
+                    <select name="visibleFlag" class="form-control m-b" th:with="type=${@dict.getType('enable_flag')}">
+                        <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">排序标识：</label>
+                <div class="col-sm-8">
+                    <input name="orderFlag" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
                 <label class="col-sm-3 control-label">是否启用：</label>
                 <div class="col-sm-8">
                     <select name="enableFlag" class="form-control m-b" th:with="type=${@dict.getType('enable_flag')}">
diff --git a/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/edit.html b/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/edit.html
index a2bf425..305f5d5 100644
--- a/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/edit.html
@@ -26,6 +26,20 @@
                 </div>
             </div>
             <div class="form-group">    
+                <label class="col-sm-3 control-label">是否显示：</label>
+                <div class="col-sm-8">
+                    <select name="visibleFlag" class="form-control m-b" th:with="type=${@dict.getType('enable_flag')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{visibleFlag}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">排序标识：</label>
+                <div class="col-sm-8">
+                    <input name="orderFlag" th:field="*{orderFlag}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
                 <label class="col-sm-3 control-label">是否启用：</label>
                 <div class="col-sm-8">
                     <select name="enableFlag" class="form-control m-b" th:with="type=${@dict.getType('enable_flag')}">
diff --git a/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/sysParamConfig.html b/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/sysParamConfig.html
index 33e4921..15d7b0f 100644
--- a/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/sysParamConfig.html
+++ b/ruoyi-admin/src/main/resources/templates/base/sysParamConfig/sysParamConfig.html
@@ -91,7 +91,16 @@
                 {
                     field: 'paramText',
                     title: '参数说明'
-                },
+                },{
+                        field: 'visibleFlag',
+                        title: '是否显示',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(enableFlagDatas, value);
+                        }
+                    },{
+                        field: 'orderFlag',
+                        title: '排序标识'
+                    },
                 {
                     field: 'enableFlag',
                     title: '是否启用',
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysParamConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysParamConfig.java
index 4c45585..059cda6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysParamConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysParamConfig.java
@@ -34,6 +34,12 @@ public class SysParamConfig extends BaseEntity
     @Excel(name = "是否启用")
     private Long enableFlag;
 
+    /** 是否显示 */
+    private Integer visibleFlag;
+
+    /** 排序标识 */
+    private Long orderFlag;
+
     public void setObjId(Long objId)
     {
         this.objId = objId;
@@ -80,6 +86,22 @@ public class SysParamConfig extends BaseEntity
         return enableFlag;
     }
 
+    public Integer getVisibleFlag() {
+        return visibleFlag;
+    }
+
+    public void setVisibleFlag(Integer visibleFlag) {
+        this.visibleFlag = visibleFlag;
+    }
+
+    public Long getOrderFlag() {
+        return orderFlag;
+    }
+
+    public void setOrderFlag(Long orderFlag) {
+        this.orderFlag = orderFlag;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml
index 4200d98..355df3e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml
@@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="paramTitle"    column="Param_Title"    />
         <result property="paramText"    column="Param_Text"    />
         <result property="enableFlag"    column="Enable_Flag"    />
+        <result property="visibleFlag"    column="Visible_Flag"    />
+        <result property="orderFlag"    column="Order_Flag"    />
         <result property="createBy"    column="Create_By"    />
         <result property="createTime"    column="Create_Time"    />
         <result property="updateBy"    column="Update_By"    />
@@ -17,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysParamConfigVo">
-        select ObjId, Param_Type, Param_Title, Param_Text, Enable_Flag, Create_By, Create_Time, Update_By, Update_Time from sys_param_config
+        select ObjId, Param_Type, Param_Title, Param_Text, Enable_Flag, Create_By, Create_Time, Update_By, Update_Time,Visible_Flag,Order_Flag from sys_param_config
     </sql>
 
     <select id="selectSysParamConfigList" parameterType="SysParamConfig" resultMap="SysParamConfigResult">
@@ -27,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paramTitle != null  and paramTitle != ''"> and Param_Title = #{paramTitle}</if>
             <if test="paramText != null  and paramText != ''"> and Param_Text = #{paramText}</if>
             <if test="enableFlag != null "> and Enable_Flag = #{enableFlag}</if>
+            <if test="visibleFlag != null "> and Visible_Flag = #{visibleFlag}</if>
         </where>
     </select>
     
@@ -42,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paramTitle != null">Param_Title,</if>
             <if test="paramText != null">Param_Text,</if>
             <if test="enableFlag != null">Enable_Flag,</if>
+            <if test="visibleFlag != null">Visible_Flag,</if>
+            <if test="orderFlag != null">Order_Flag,</if>
             <if test="createBy != null">Create_By,</if>
             <if test="createTime != null">Create_Time,</if>
             <if test="updateBy != null">Update_By,</if>
@@ -52,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paramTitle != null">#{paramTitle},</if>
             <if test="paramText != null">#{paramText},</if>
             <if test="enableFlag != null">#{enableFlag},</if>
+            <if test="visibleFlag != null">#{visibleFlag},</if>
+            <if test="orderFlag != null">#{orderFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -66,6 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="paramTitle != null">Param_Title = #{paramTitle},</if>
             <if test="paramText != null">Param_Text = #{paramText},</if>
             <if test="enableFlag != null">Enable_Flag = #{enableFlag},</if>
+            <if test="visibleFlag != null">Visible_Flag = #{visibleFlag},</if>
+            <if test="orderFlag != null">Order_Flag = #{orderFlag},</if>
             <if test="createBy != null">Create_By = #{createBy},</if>
             <if test="createTime != null">Create_Time = #{createTime},</if>
             <if test="updateBy != null">Update_By = #{updateBy},</if>