瀏覽代碼

人员管理表添加leader信息

zhaoxian 4 年之前
父節點
當前提交
77f3ed7f3c

+ 29 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.system.controller;
 
 
+import cn.com.ctop.alarm.modules.entity.AlarmEventSend;
 import cn.com.ctop.common.module.annotation.PermissionData;
 import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.mapper.UserCompanyMapper;
@@ -117,11 +118,22 @@ public class SysUserController {
     public Map<String, Object> getAllDesigner() {
         Map<String, Object> map = new HashMap<>();
         List<SysUser> userList = sysUserService.getAllDesigner();
-        map.put("data",userList);
+        map.put("data", userList);
         ResultMapUtils.setResultMap(map, StatusCode.COMMON_SUCCESS);
         return map;
     }
 
+    @RequestMapping(value = "/getAllUser", method = RequestMethod.GET)
+    public Result<Object> getAllUser() {
+        try {
+            List<SysUserVo> allUser = sysUserService.getAllUser(null);
+            return Result.ok(allUser);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.error("查询失败");
+    }
+
 
     @Resource
     private UserCompanyMapper userCompanyMapper;
@@ -135,7 +147,7 @@ public class SysUserController {
      * @param req
      * @return
      */
-    @PermissionData(pageComponent = "system/UserList")
+   /* @PermissionData(pageComponent = "system/UserList")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
@@ -145,7 +157,6 @@ public class SysUserController {
         Page<SysUser> page = new Page<>(pageNo, pageSize);
         IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
 
-
         //批量查询用户的所属部门
         //step.1 先拿到全部的 useids
         //step.2 通过 useids,一次性查询用户的所属部门名字
@@ -160,6 +171,21 @@ public class SysUserController {
         result.setResult(pageList);
         log.info(pageList.toString());
         return result;
+    }*/
+
+    @PermissionData(pageComponent = "system/UserList")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public Result<Object> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        try {
+            PageHelper.startPage(pageNo, pageSize);
+            List<SysUser> list = sysUserService.queryPageList(user);
+            PageInfo<SysUser> pageInfo = new PageInfo<>(list);
+            return Result.ok(pageInfo);
+        } catch (Exception e) {
+            log.error("获取用户列表数据-分页列表查询异常", e);
+        }
+        return Result.error("查询失败");
     }
 
     @RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)

+ 118 - 68
module-common/src/main/java/cn/com/ctop/common/module/entity/SysDepart.java

@@ -19,85 +19,135 @@ import java.util.Objects;
  * <p>
  *
  * @Author Steve
- * @Since  2019-01-22
+ * @Since 2019-01-22
  */
 @Data
 @TableName("sys_depart")
 public class SysDepart implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**ID*/
-	@TableId(type = IdType.ID_WORKER_STR)
-	private String id;
-	/**父机构ID*/
-	private String parentId;
-	/**机构/部门名称*/
-	@Excel(name="机构/部门名称",width=15)
-	private String departName;
-	/**英文名*/
-	@Excel(name="英文名",width=15)
-	private String departNameEn;
-	/**缩写*/
-	private String departNameAbbr;
-	/**排序*/
-	@Excel(name="排序",width=15)
-	private Integer departOrder;
-	/**描述*/
-	@Excel(name="描述",width=15)
-	private String description;
-	/**机构类别 1组织机构,2岗位*/
-	@Excel(name="机构类别",width=15,dicCode="org_category")
-	private String orgCategory;
-	/**机构类型*/
-	private String orgType;
-	/**机构编码*/
-	@Excel(name="机构编码",width=15)
-	private String orgCode;
-	/**手机号*/
-	@Excel(name="手机号",width=15)
-	private String mobile;
-	/**传真*/
-	@Excel(name="传真",width=15)
-	private String fax;
-	/**地址*/
-	@Excel(name="地址",width=15)
-	private String address;
-	/**备注*/
-	@Excel(name="备注",width=15)
-	private String memo;
-	/**状态(1启用,0不启用)*/
-	@Dict(dicCode = "depart_status")
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ID_WORKER_STR)
+    private String id;
+    /**
+     * 父机构ID
+     */
+    private String parentId;
+    /**
+     * 机构/部门名称
+     */
+    @Excel(name = "机构/部门名称", width = 15)
+    private String departName;
+    /**
+     * 英文名
+     */
+    @Excel(name = "英文名", width = 15)
+    private String departNameEn;
+    /**
+     * 缩写
+     */
+    private String departNameAbbr;
+    /**
+     * 排序
+     */
+    @Excel(name = "排序", width = 15)
+    private Integer departOrder;
+    /**
+     * 描述
+     */
+    @Excel(name = "描述", width = 15)
+    private String description;
+    /**
+     * 机构类别 1组织机构,2岗位
+     */
+    @Excel(name = "机构类别", width = 15, dicCode = "org_category")
+    private String orgCategory;
+    /**
+     * 机构类型
+     */
+    private String orgType;
+    /**
+     * 机构编码
+     */
+    @Excel(name = "机构编码", width = 15)
+    private String orgCode;
+    /**
+     * 手机号
+     */
+    @Excel(name = "手机号", width = 15)
+    private String mobile;
+    /**
+     * 传真
+     */
+    @Excel(name = "传真", width = 15)
+    private String fax;
+    /**
+     * 地址
+     */
+    @Excel(name = "地址", width = 15)
+    private String address;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    private String memo;
+    /**
+     * 状态(1启用,0不启用)
+     */
+    @Dict(dicCode = "depart_status")
     private String status;
-	/**删除状态(0,正常,1已删除)*/
-	@Dict(dicCode = "del_flag")
+    /**
+     * 删除状态(0,正常,1已删除)
+     */
+    @Dict(dicCode = "del_flag")
     private String delFlag;
-	/**创建人*/
-	private String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-	/**更新人*/
-	private String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date updateTime;
+    /**
+     * 创建人
+     */
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 领导 ID
+     */
+    private String leaderId;
+
+    /**
+     * 领导姓名
+     */
+    private String leaderName;
 
-	/**
-	 * 重写equals方法
-	 */
+    /**
+     * 重写equals方法
+     */
     @Override
     public boolean equals(Object o) {
         if (this == o) {
-			return true;
-		}
+            return true;
+        }
         if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
+            return false;
+        }
         if (!super.equals(o)) {
-			return false;
-		}
+            return false;
+        }
         SysDepart depart = (SysDepart) o;
         return Objects.equals(id, depart.id) &&
                 Objects.equals(parentId, depart.parentId) &&
@@ -126,8 +176,8 @@ public class SysDepart implements Serializable {
     @Override
     public int hashCode() {
         return Objects.hash(super.hashCode(), id, parentId, departName,
-        		departNameEn, departNameAbbr, departOrder, description,
-        		orgType, orgCode, mobile, fax, address, memo, status,
-        		delFlag, createBy, createTime, updateBy, updateTime);
+                departNameEn, departNameAbbr, departOrder, description,
+                orgType, orgCode, mobile, fax, address, memo, status,
+                delFlag, createBy, createTime, updateBy, updateTime);
     }
 }

+ 24 - 7
module-common/src/main/java/cn/com/ctop/common/module/entity/SysUser.java

@@ -66,7 +66,7 @@ public class SysUser implements Serializable {
     /**
      * 头像
      */
-    @Excel(name = "头像", width = 15,type = 2)
+    @Excel(name = "头像", width = 15, type = 2)
     private String avatar;
 
     /**
@@ -104,14 +104,14 @@ public class SysUser implements Serializable {
     /**
      * 状态(1:正常  2:冻结 )
      */
-    @Excel(name = "状态", width = 15,dicCode="user_status")
+    @Excel(name = "状态", width = 15, dicCode = "user_status")
     @Dict(dicCode = "user_status")
     private Integer status;
 
     /**
      * 删除状态(0,正常,1已删除)
      */
-    @Excel(name = "删除状态", width = 15,dicCode="del_flag")
+    @Excel(name = "删除状态", width = 15, dicCode = "del_flag")
     @TableLogic
     private Integer delFlag;
 
@@ -160,14 +160,14 @@ public class SysUser implements Serializable {
     /**
      * 身份(0 普通成员 1 上级)
      */
-    @Excel(name="(1普通成员 2上级)",width = 15)
+    @Excel(name = "(1普通成员 2上级)", width = 15)
     private Integer userIdentity;
 
     /**
      * 负责部门
      */
-    @Excel(name="负责部门",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
-    @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
+    @Excel(name = "负责部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     private String departIds;
 
 
@@ -199,8 +199,25 @@ public class SysUser implements Serializable {
     private String depart;
 
     /**
-     * 部门
+     * 角色
      */
     @TableField(exist = false)
     private String roleName;
+
+    /**
+     * 组织机构名称
+     */
+    @TableField(exist = false)
+    private String departName;
+
+    /**
+     * 领导 ID
+     */
+    private String leaderId;
+
+    /**
+     * 领导姓名
+     */
+    private String leaderName;
+
 }

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java

@@ -172,4 +172,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     JSONObject selectUserByAccount(@Param("accountId") Long accountId);
 
     SysUser getDesignerTeamLeaderBy(@Param("orgCode")String orgCode);
+
+    List<SysUser> queryPageList(SysUser user);
 }

+ 36 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml

@@ -271,4 +271,40 @@ SELECT
         AND
             role.role_code = 'designTeamLeader'
     </select>
+    <select id="queryPageList" resultType="cn.com.ctop.common.module.entity.SysUser">
+        SELECT t1.*,t3.depart_name ,role.role_name
+        FROM sys_user t1
+         LEFT JOIN sys_user_depart t2 ON t1.id = t2.user_id
+         LEFT JOIN sys_depart t3 ON t2.dep_id = t3.id
+         LEFT JOIN sys_user_role userRole ON t1.id = userRole.user_id
+         LEFT JOIN sys_role role ON userRole.role_id = role.id
+        where 1=1
+        <if test="realname != null and realname != ''">
+            AND t1.realname LIKE CONCAT(CONCAT('%',#{realname}),'%')
+        </if>
+        <if test="username != null and username != ''">
+            AND t1.username LIKE CONCAT(CONCAT('%',#{username}),'%')
+        </if>
+        <if test="email != null and email != ''">
+            AND t1.email LIKE CONCAT(CONCAT('%',#{email}),'%')
+        </if>
+        <if test="phone != null and phone != ''">
+            AND t1.phone LIKE CONCAT(CONCAT('%',#{phone}),'%')
+        </if>
+        <if test="status != null and status != ''">
+            AND t1.`status` = #{status}
+        </if>
+        <if test="leaderName != null and leaderName != ''">
+            AND t1.leader_name LIKE CONCAT(CONCAT('%',#{leaderName}),'%')
+        </if>
+        <if test="departName != null and departName != ''">
+            AND t3.depart_name LIKE CONCAT(CONCAT('%',#{departName}),'%')
+        </if>
+        <if test="roleName != null and roleName != ''">
+            AND role.role_name LIKE CONCAT(CONCAT('%',#{roleName}),'%')
+        </if>
+        <if test="sex != null and sex != ''">
+            AND t1.sex =#{sex}
+        </if>
+    </select>
 </mapper>

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/ISysUserService.java

@@ -264,4 +264,6 @@ public interface ISysUserService extends IService<SysUser> {
     List<SysUser> getAllDesigner();
 
     SysUser getDesignerTeamLeaderBy(String orgCode);
+
+    List<SysUser> queryPageList(SysUser user);
 }

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/SysUserServiceImpl.java

@@ -283,6 +283,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
+    public List<SysUser> queryPageList(SysUser user) {
+        return userMapper.queryPageList(user);
+    }
+
+    @Override
     public Map<String, String> getDepNamesByUserIds(List<String> userIds) {
         List<SysUserDepVo> list = this.baseMapper.getDepNamesByUserIds(userIds);
         Map<String, String> res = new HashMap<String, String>();