Merge remote-tracking branch 'origin/feature_select_by_dept' into feature_select_by_dept

data-ui/src/views/data/digitalforest/linleader/index.vue

@@ -280,6 +280,13 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="序号" prop="num">
+              <el-input-number v-model="form.num" :min="1" :max="99999"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="24">
             <el-form-item label="责任区" prop="linResponsibility">
               <el-input v-model="form.linResponsibility" placeholder="请输入备注" type="textarea" maxlength="200"/>
@@ -509,6 +516,7 @@
           deptName: null,
           linName: null,
           linSex: null,
+          num:99,
           linPhone: null
         };
         this.resetForm("form");

data-ui/src/views/data/digitalwater/length/index.vue

@@ -219,7 +219,7 @@
                           placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"/>
             </el-form-item>
             <el-form-item label="排序" prop="sort">
-              <el-input-number controls-position="right" v-model="form.sort" placeholder="请输入排序" maxlength="50" :min="1" :max="99999"/>
+              <el-input-number  v-model="form.sort" placeholder="请输入排序"  :min="1" :max="99999"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -454,7 +454,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        sort: null,
+        sort: 99,
         id: null,
         userId: null,
         name: null,

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/CenterdataTForestLinleaderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.data.digitalforest.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.SecurityUtils;
@@ -66,6 +67,9 @@ public class CenterdataTForestLinleaderServiceImpl extends BaseServiceImpl imple
         centerdataTForestLinleader.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTForestLinleader.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTForestLinleader.setCreateTime(DateUtils.getNowDate());
+        if (StringUtils.isEmpty(centerdataTForestLinleader.getNum())){
+            centerdataTForestLinleader.setNum("99");
+        }
         return centerdataTForestLinleaderMapper.insertCenterdataTForestLinleader(centerdataTForestLinleader);
     }
 
@@ -80,6 +84,9 @@ public class CenterdataTForestLinleaderServiceImpl extends BaseServiceImpl imple
         centerdataTForestLinleader.setUpdateBy(SecurityUtils.getUserId());
         centerdataTForestLinleader.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTForestLinleader.setUpdateTime(DateUtils.getNowDate());
+        if (StringUtils.isEmpty(centerdataTForestLinleader.getNum())){
+            centerdataTForestLinleader.setNum("99");
+        }
         return centerdataTForestLinleaderMapper.updateCenterdataTForestLinleader(centerdataTForestLinleader);
     }
 

src/main/java/com/sooka/sponest/data/digitalwater/domain/WaterConservancyViewBO.java

@@ -40,6 +40,9 @@ public class WaterConservancyViewBO extends BaseBusinessEntity {
     //名称
     @ApiModelProperty(value = "名称", required = false)
     private String name;
+    //排序
+    @ApiModelProperty(value = "排序", required = false)
+    private Long sort;
 
     //类型（2.河长 3.路长 6.田长）
     @ApiModelProperty(value = "类型（2.河长 3.路长 6.田长）", required = false)

src/main/resources/mapper/digitalforest/CenterdataTForestLinleaderMapper.xml

@@ -27,6 +27,7 @@
         <result property="userId" column="user_id"/>
         <result property="createName" column="create_name"/>
         <result property="updateName" column="update_name"/>
+        <result property="num" column="num"/>
     </resultMap>
 
     <resultMap type="UserBo" id="UserBoResult">
@@ -35,7 +36,7 @@
     </resultMap>
 
     <sql id="selectCenterdataTForestLinleaderVo">
-        select id, lin_name,lin_sex,lin_duty,lin_phone,admini_strative_lin_job,lin_responsibility,create_by, create_time, update_by, update_time, data_status, lin_level, lin_job, lin_number, lin_grid_id, lin_grid_name, dept_id, dept_name,user_id, update_name , create_name
+        select id, lin_name,lin_sex,lin_duty,lin_phone,admini_strative_lin_job,lin_responsibility,create_by, create_time, update_by, update_time, data_status, lin_level, lin_job, lin_number, lin_grid_id, lin_grid_name, dept_id, dept_name,user_id, update_name , create_name,num
         from centerdata_t_forest_linleader
     </sql>
 
@@ -43,7 +44,7 @@
             resultMap="CenterdataTForestLinleaderResult">
         select a.id, a.lin_name,a.lin_sex,a.lin_duty,a.lin_phone,a.lin_responsibility,a.create_by, a.create_time,a.admini_strative_lin_job,
         a.update_by, a.update_time, a.data_status, a.lin_level, a.lin_job, a.lin_number, a.lin_grid_id, a.lin_grid_name,
-        a.dept_id, a.dept_name,a.user_id,a.update_name ,  a.create_name from centerdata_t_forest_linleader a
+        a.dept_id, a.dept_name,a.user_id,a.update_name ,  a.create_name,a.num from centerdata_t_forest_linleader a
         left join ${database_system}.sys_dept d on a.dept_id=d.dept_id
         <where>
             <if test="dataStatus != null  and dataStatus != ''">and a.data_status = #{dataStatus}</if>
@@ -66,7 +67,7 @@
             </if>
             ${params.dataScope}
         </where>
-        order by a.create_time desc
+        order by a.num,a.create_time desc
     </select>
 
     <select id="selectCenterdataTForestLinleaderById" parameterType="String"
@@ -99,6 +100,7 @@
             <if test="deptName != null">dept_name,</if>
             <if test="userId != null">user_id,</if>
             <if test="createName != null and createName != ''">create_name,</if>
+            <if test="num != null and num != ''">num,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -122,6 +124,7 @@
             <if test="deptName != null">#{deptName},</if>
             <if test="userId != null">#{userId},</if>
             <if test="createName != null and createName != ''">#{createName},</if>
+            <if test="num != null and num != ''">#{num},</if>
         </trim>
     </insert>
 
@@ -148,6 +151,7 @@
             <if test="deptName != null">dept_name = #{deptName},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="updateName != null and updateName != ''">update_name = #{updateName},</if>
+            <if test="num != null and num != ''">num = #{num},</if>
         </trim>
         where id = #{id}
     </update>

src/main/resources/mapper/digitalforest/ForestViewMapper.xml

@@ -108,5 +108,6 @@
                 ${params.dataScope}
             </otherwise>
         </choose>
+        order by a.num,a.create_time desc
     </select>
 </mapper>

src/main/resources/mapper/digitalwater/WaterConservancyViewMapper.xml

@@ -130,13 +130,15 @@
 
     <select id="getTianList" parameterType="WaterConservancyViewBO" resultType="map">
         SELECT
-            GROUP_CONCAT( a.gridId ) gridId, `name`,  phone, id
+            GROUP_CONCAT( a.gridId ) gridId, `name`,  phone, id,sort,create_time createTime
         FROM(
             SELECT
                 DISTINCT a.user_id userId,
                 a.id,
                 a.`name`,
                 a.phone,
+                a.sort,
+                a.create_time,
                 a.grid_id gridId
             FROM
                 centerdata_t_hydraulic_river_length a
@@ -146,6 +148,7 @@
             ) a
         GROUP BY
             a.userId
+        order by a.sort asc,a.create_time desc
     </select>
 
     <select id="getGridList" parameterType="WaterConservancyViewBO" resultType="map">