From 12e7a2cbb61e9ee6de050ed2a48cbaadf9b638ee Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Mon, 26 Oct 2020 14:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=84=E4=BC=B0=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E3=80=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/benyi/assessmentcontent/index.vue   | 36 ++++++++-----------
 .../src/views/benyi/assessmentstudy/index.vue |  2 +-
 .../benyi/domain/ByAssessmentcontent.java     | 23 ++++++++++--
 .../benyi/ByAssessmentcontentMapper.xml       | 21 +++++++----
 4 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
index 67ac0d52c..ce4cc3d99 100644
--- a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
@@ -86,14 +86,6 @@
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
     <!-- 添加或修改评估内容对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -132,6 +124,13 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="序号" prop="sort">
+          <el-input-number
+            v-model="form.sort"
+            :min="0"
+            placeholder="请输入序号"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -165,8 +164,6 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
-      // 总条数
-      total: 0,
       // 评估内容表格数据
       assessmentcontentList: [],
       // 范围选项
@@ -181,8 +178,6 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         parentId: undefined,
         name: undefined,
         iselement: undefined,
@@ -200,6 +195,7 @@ export default {
           { required: true, message: "是否元素不能为空", trigger: "blur" },
         ],
         scope: [{ required: true, message: "范围不能为空", trigger: "blur" }],
+        sort: [{ required: true, message: "序号不能为空", trigger: "blur" }],
       },
     };
   },
@@ -226,7 +222,6 @@ export default {
       this.loading = true;
       listAssessmentcontent(this.queryParams).then((response) => {
         this.assessmentcontentList = this.handleTree(response.rows, "id");
-        this.total = response.total;
         this.loading = false;
       });
     },
@@ -264,6 +259,7 @@ export default {
         iselement: undefined,
         scope: undefined,
         createTime: undefined,
+        sort: 0,
       };
       this.resetForm("form");
     },
@@ -331,15 +327,11 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$confirm(
-        '是否确认删除名称为"' + row.name + '"的数据项?',
-        "警告",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
+      this.$confirm('是否确认删除名称为"' + row.name + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
         .then(function () {
           return delAssessmentcontent(row.id);
         })
diff --git a/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue b/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue
index b014176fb..04abaebb5 100644
--- a/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentstudy/index.vue
@@ -107,7 +107,7 @@ export default {
       getAssessmentcontentbyparentid(this.queryParams.id).then((response) => {
         var tmp = "";
         response.data.forEach((element) => {
-          tmp = tmp + element.name + "</br>";
+          tmp = tmp + element.sort + ". " + element.name + "</br>";
         });
         this.note = tmp;
       });
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentcontent.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentcontent.java
index 8ba49b17b..f9f0395ef 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentcontent.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentcontent.java
@@ -40,6 +40,12 @@ public class ByAssessmentcontent extends BaseEntity {
     @Excel(name = "是否元素")
     private String iselement;
 
+    /**
+     * 序号
+     */
+    @Excel(name = "序号")
+    private Long sort;
+
     public String getParentName() {
         return parentName;
     }
@@ -56,10 +62,14 @@ public class ByAssessmentcontent extends BaseEntity {
         this.children = children;
     }
 
-    /** 父部门名称 */
+    /**
+     * 父部门名称
+     */
     private String parentName;
 
-    /** 子部门 */
+    /**
+     * 子部门
+     */
     private List<ByAssessmentcontent> children = new ArrayList<ByAssessmentcontent>();
 
     /**
@@ -100,6 +110,14 @@ public class ByAssessmentcontent extends BaseEntity {
         return scope;
     }
 
+    public void setSort(Long sort) {
+        this.sort = sort;
+    }
+
+    public Long getSort() {
+        return sort;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -109,6 +127,7 @@ public class ByAssessmentcontent extends BaseEntity {
                 .append("iselement", getIselement())
                 .append("scope", getScope())
                 .append("createTime", getCreateTime())
+                .append("sort", getSort())
                 .toString();
     }
 
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
index 1409c9fdc..1d2a3ec8b 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
@@ -11,10 +11,11 @@
         <result property="iselement" column="iselement"/>
         <result property="scope" column="scope"/>
         <result property="createTime" column="create_time"/>
+        <result property="sort"    column="sort"    />
     </resultMap>
 
     <sql id="selectByAssessmentcontentVo">
-        select id, parentId, name, iselement, scope, create_time from by_assessmentcontent
+        select id, parentId, name, iselement, scope, create_time, sort from by_assessmentcontent
     </sql>
 
     <select id="selectByAssessmentcontentList" parameterType="ByAssessmentcontent"
@@ -26,20 +27,23 @@
             <if test="iselement != null  and iselement != ''">and iselement = #{iselement}</if>
             <if test="scope != null  and scope != ''">and scope = #{scope}</if>
         </where>
+        order by sort
     </select>
 
     <select id="selectByAssessmentcontentstudyList" parameterType="ByAssessmentcontent"
             resultMap="ByAssessmentcontentResult">
-select -1 as id, -2 as parentId, title as name, 'N' as iselement  from by_assessmentintroduce
+select * from (
+select -1 as id, -2 as parentId, title as name, 'N' as iselement, 0 as sort  from by_assessmentintroduce
 union all
-select dict_value,-1,dict_label,'N' from sys_dict_data where dict_type='sys_dm_pgyssyfw'
+select dict_value,-1,dict_label,'N', 0 from sys_dict_data where dict_type='sys_dm_pgyssyfw'
 union all
-select id,parentId,name,iselement from by_assessmentcontent where scope=1 and parentId!=0 and iselement='N'
+select id,parentId,name,iselement,sort from by_assessmentcontent where scope=1 and parentId!=0 and iselement='N'
 union all
-select id,parentId,name,iselement from by_assessmentcontent where scope=2 and parentId!=0 and iselement='N'
+select id,parentId,name,iselement,sort from by_assessmentcontent where scope=2 and parentId!=0 and iselement='N'
 union all
-select id,parentId,name,iselement from by_assessmentcontent where scope=3 and parentId!=0 and iselement='N'
-
+select id,parentId,name,iselement,sort from by_assessmentcontent where scope=3 and parentId!=0 and iselement='N'
+) t
+order by t.sort
     </select>
 
     <select id="selectByAssessmentcontentById" parameterType="Long" resultMap="ByAssessmentcontentResult">
@@ -60,6 +64,7 @@ select id,parentId,name,iselement from by_assessmentcontent where scope=3 and pa
             <if test="iselement != null  and iselement != ''">iselement,</if>
             <if test="scope != null  and scope != ''">scope,</if>
             <if test="createTime != null ">create_time,</if>
+            <if test="sort != null ">sort,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="parentId != null ">#{parentId},</if>
@@ -67,6 +72,7 @@ select id,parentId,name,iselement from by_assessmentcontent where scope=3 and pa
             <if test="iselement != null  and iselement != ''">#{iselement},</if>
             <if test="scope != null  and scope != ''">#{scope},</if>
             <if test="createTime != null ">#{createTime},</if>
+            <if test="sort != null ">#{sort},</if>
         </trim>
     </insert>
 
@@ -78,6 +84,7 @@ select id,parentId,name,iselement from by_assessmentcontent where scope=3 and pa
             <if test="iselement != null  and iselement != ''">iselement = #{iselement},</if>
             <if test="scope != null  and scope != ''">scope = #{scope},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
+            <if test="sort != null ">sort = #{sort},</if>
         </trim>
         where id = #{id}
     </update>