【ADD】增加职工岗位字段

railway-business/src/main/java/com/railway/business/catenary/domain/vo/BusJlgzListByZzVo.java

@@ -12,14 +12,14 @@ import java.io.Serializable;
 @Data
 public class BusJlgzListByZzVo implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+  private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "原因类型")
-    private String yylx;
+  @ApiModelProperty(value = "原因类型")
+  private String yylx;
 
-    @ApiModelProperty(value = "原因类型中文")
-    private String yylxText;
+  @ApiModelProperty(value = "原因类型中文")
+  private String yylxText;
 
-    @ApiModelProperty(value = "统计次数")
-    private Integer total;
+  @ApiModelProperty(value = "统计次数")
+  private Integer total;
 }

railway-business/src/main/java/com/railway/business/catenary/domain/vo/BusJlgzQueryVo.java

@@ -1,10 +1,8 @@
 package com.railway.business.catenary.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
 import java.io.Serializable;
+import lombok.Data;
 
 /**
  * 智能查询-历史故障查询
@@ -12,23 +10,23 @@ import java.io.Serializable;
 @Data
 public class BusJlgzQueryVo implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+  private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "线路id")
-    private Long lineId;
+  @ApiModelProperty(value = "线路id")
+  private Long lineId;
 
-    @ApiModelProperty(value = "行别")
-    private String xingbie;
+  @ApiModelProperty(value = "行别")
+  private String xingbie;
 
-    @ApiModelProperty(value = "行别")
-    private String xingbieText;
+  @ApiModelProperty(value = "行别")
+  private String xingbieText;
 
-    @ApiModelProperty(value = "支柱号")
-    private String pillarCode;
+  @ApiModelProperty(value = "支柱号")
+  private String pillarCode;
 
-    @ApiModelProperty(value = "公里标")
-    private String marker;
+  @ApiModelProperty(value = "公里标")
+  private String marker;
 
-    @ApiModelProperty(value = "支柱范围")
-    private String pillarArea;
+  @ApiModelProperty(value = "支柱范围")
+  private String pillarArea;
 }

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebQueryVo.java

@@ -6,25 +6,26 @@ import lombok.Data;
 
 /**
  * 检测表查询参数
+ *
  * @author zhaomn
  */
 @Data
 public class JcebQueryVo implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+  private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "检测表类型")
-    private String jcebType;
+  @ApiModelProperty(value = "检测表类型")
+  private String jcebType;
 
-    @ApiModelProperty(value = "车间id")
-    private Long deptId;
+  @ApiModelProperty(value = "车间id")
+  private Long deptId;
 
-    @ApiModelProperty(value = "区间站场id")
-    private Long stationId;
+  @ApiModelProperty(value = "区间站场id")
+  private Long stationId;
 
-    @ApiModelProperty(value = "支柱号")
-    private String pillarCode;
+  @ApiModelProperty(value = "支柱号")
+  private String pillarCode;
 
-    @ApiModelProperty(value = "记录人/操作人")
-    private String operator;
+  @ApiModelProperty(value = "记录人/操作人")
+  private String operator;
 }

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebRecordVo.java

@@ -8,29 +8,30 @@ import lombok.Data;
 
 /**
  * 检测表查询参数
+ *
  * @author zhaomn
  */
 @Data
 public class JcebRecordVo implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+  private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
+  @ApiModelProperty(value = "所属部门")
+  private String deptName;
 
-    @ApiModelProperty(value = "站/区间名称")
-    private String stationName;
+  @ApiModelProperty(value = "站/区间名称")
+  private String stationName;
 
-    @ApiModelProperty(value = "检测表类型")
-    private String jcebType;
+  @ApiModelProperty(value = "检测表类型")
+  private String jcebType;
 
-    @ApiModelProperty(value = "记录人/操作人")
-    private String operator;
+  @ApiModelProperty(value = "记录人/操作人")
+  private String operator;
 
-    @ApiModelProperty(value = "记录数")
-    private int count;
+  @ApiModelProperty(value = "记录数")
+  private int count;
 
-    @ApiModelProperty(value = "记录日期/操作日期")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date operationDate;
+  @ApiModelProperty(value = "记录日期/操作日期")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date operationDate;
 }

railway-common/src/main/java/com/railway/common/core/domain/entity/SysUser.java

@@ -83,6 +83,16 @@ public class SysUser extends BaseEntity {
    */
   private String userType;
 
+  /**
+   * 岗位
+   */
+  private String post;
+
+  /**
+   * 岗位名
+   */
+  private String postText;
+
   /**
    * 用户邮箱
    */

railway-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -10,6 +10,8 @@
     <result property="userName" column="user_name"/>
     <result property="nickName" column="nick_name"/>
     <result property="realName" column="real_name"/>
+    <result property="post" column="post"/>
+    <result property="postText" column="post_text"/>
     <result property="email" column="email"/>
     <result property="phone" column="phone"/>
     <result property="wechat" column="wechat"/>
@@ -49,22 +51,25 @@
   </resultMap>
 
   <sql id="selectUserVo">
-    select u.user_id, u.dept_id, u.user_name, u.nick_name, u.real_name, u.email, u.avatar, u.phone, u.wechat,
-    u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time,
-    u.remark,u.birthday,
+    select u.user_id, u.dept_id, u.user_name, u.nick_name, u.real_name, u.email, u.avatar, u.phone,
+    u.wechat, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by,
+    u.create_time, u.remark,u.birthday,u.post, dict.dict_label,
     d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
     r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
     from sys_user u
     left join sys_dept d on u.dept_id = d.dept_id
     left join sys_user_role ur on u.user_id = ur.user_id
     left join sys_role r on r.role_id = ur.role_id
+    LEFT JOIN sys_dict_data dict ON (u.post = dict.dict_value AND dict.dict_type = 'postType')
   </sql>
 
   <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
     select u.user_id, u.dept_id, u.nick_name, u.user_name, u.real_name, u.email, u.avatar, u.phone, u.wechat,
     u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time,
-    u.birthday, u.remark, d.dept_name, d.leader from sys_user u
+    u.birthday, u.remark, d.dept_name, d.leader, u.post, dict.dict_label
+    from sys_user u
     left join sys_dept d on u.dept_id = d.dept_id
+    LEFT JOIN sys_dict_data dict ON (u.post = dict.dict_value AND dict.dict_type = 'postType')
     where u.del_flag = '0'
     <if test="userId != null and userId != 0">
       AND u.user_id = #{userId}
@@ -93,12 +98,13 @@
   </select>
 
   <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.real_name, u.email, u.phone, u.wechat,
-    u.status, u.create_time
+    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.real_name, u.email, u.phone,
+    u.wechat, u.status, u.create_time, u.post, dict.dict_label
     from sys_user u
     left join sys_dept d on u.dept_id = d.dept_id
     left join sys_user_role ur on u.user_id = ur.user_id
     left join sys_role r on r.role_id = ur.role_id
+    LEFT JOIN sys_dict_data dict ON (u.post = dict.dict_value AND dict.dict_type = 'postType')
     where u.del_flag = '0' and r.role_id = #{roleId}
     <if test="userName != null and userName != ''">
       AND u.user_name like concat('%', #{userName}, '%')
@@ -111,12 +117,13 @@
   </select>
 
   <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.real_name, u.email, u.phone, u.wechat,
-    u.status, u.create_time
+    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.real_name, u.email, u.phone,
+    u.wechat, u.status, u.create_time, u.post, dict.dict_label
     from sys_user u
     left join sys_dept d on u.dept_id = d.dept_id
     left join sys_user_role ur on u.user_id = ur.user_id
     left join sys_role r on r.role_id = ur.role_id
+    LEFT JOIN sys_dict_data dict ON (u.post = dict.dict_value AND dict.dict_type = 'postType')
     where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
     and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id
     = ur.user_id and ur.role_id = #{roleId})
@@ -159,6 +166,7 @@
     <if test="userName != null and userName != ''">user_name,</if>
     <if test="nickName != null and nickName != ''">nick_name,</if>
     <if test="realName != null and realName != ''">real_name,</if>
+    <if test="post != null and post != ''">post,</if>
     <if test="email != null and email != ''">email,</if>
     <if test="avatar != null and avatar != ''">avatar,</if>
     <if test="phone != null and phone != ''">phone,</if>
@@ -176,6 +184,7 @@
     <if test="userName != null and userName != ''">#{userName},</if>
     <if test="nickName != null and nickName != ''">#{nickName},</if>
     <if test="realName != null and realName != ''">#{realName},</if>
+    <if test="post != null and post != ''">#{post},</if>
     <if test="email != null and email != ''">#{email},</if>
     <if test="avatar != null and avatar != ''">#{avatar},</if>
     <if test="phone != null and phone != ''">#{phone},</if>
@@ -197,6 +206,7 @@
       <if test="userName != null and userName != ''">user_name = #{userName},</if>
       <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
       <if test="realName != null and realName != ''">real_name = #{realName},</if>
+      <if test="post != null and post != ''">post = #{post},</if>
       <if test="email != null ">email = #{email},</if>
       <if test="phone != null ">phone = #{phone},</if>
       <if test="wechat != null and wechat != ''">wechat = #{wechat},</if>