人员选择 按照部门分组的

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserController.java

@@ -40,7 +40,11 @@ public class TSysUserController {
 
 
 
-
+	@ApiOperation(value = "根据单位名称人员分组")
+	@GetMapping("/getUserListByDept")
+	public R getUserListByDept() {
+		return userService.getUserListByDept();
+	}
 
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSysUserMapper.java

 package cn.wise.sc.acquisition.business.mapper;
 
 import cn.wise.sc.acquisition.business.entity.TSysUser;
+import cn.wise.sc.acquisition.business.model.vo.UserVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +16,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TSysUserMapper extends BaseMapper<TSysUser> {
 
+	List<UserVo> getUserListByDept();
+
+
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSysUserMapper.xml

@@ -2,4 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TSysUserMapper">
 
+
+    <select id="getUserListByDept" resultType="cn.wise.sc.acquisition.business.model.vo.UserVo">
+       select tsu.ID,tsu.Name,tsu.LoginID,  tsr.Name as roleName, tsu.ProcessesName, tsu.Duty, tsu.Description,
+        tsd.Name as DeptName
+        from T_Sys_Dept tsd
+        left join T_Sys_User tsu on tsu.DeptID = tsd.id
+        left join T_Sys_Role tsr on tsr.ID = tsu.RoleID
+        where tsu.id is not null
+    </select>
+
+
+
+
 </mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/UserVo.java

@@ -16,78 +16,20 @@ import java.time.LocalDateTime;
 @ApiModel("用户Vo")
 public class UserVo {
 
-	private Integer id;
+	private Integer ID;
 
-	@ApiModelProperty("用户账号")
-	private String username;
+	private String Name;
 
-	@ApiModelProperty("真实姓名")
-	private String name;
+	private String LoginID;
 
-	@ApiModelProperty("性别0女1男")
-	private Integer sex;
-
-	@ApiModelProperty("部门id")
-	private Integer groupId;
-
-	@ApiModelProperty("职务id")
-	private Integer postId;
-
-	@ApiModelProperty("微信号")
-	private String wxId;
-
-	@ApiModelProperty("职称")
-	private String qualifications;
-
-	@ApiModelProperty("状态（0禁用，1启用）")
-	private Integer status;
-
-	@ApiModelProperty("工作年限")
-	private Double workYear;
-
-	@ApiModelProperty("手机号")
-	private String phone;
-
-	@ApiModelProperty("传真")
-	private String fax;
-
-	@ApiModelProperty("专业")
-	private String major;
-
-	@ApiModelProperty("邮箱")
-	private String email;
-
-	@ApiModelProperty("从事本技术领域日期")
-	private LocalDate technologyDate;
-
-	@ApiModelProperty("从事本技术领域年限")
-	private Double technologyYear;
-
-	@ApiModelProperty("文化程度")
-	private String education;
-
-	@ApiModelProperty("（0删除，1正常）")
-	private Integer isDelete;
-
-	@ApiModelProperty("创建时间")
-	private LocalDateTime createTime;
-
-	@ApiModelProperty("修改时间")
-	private LocalDateTime updateTime;
-
-	@ApiModelProperty("备注")
-	private String remark;
+	private String roleName;
 
-	@ApiModelProperty("组名称")
-	private String groupName;
+	private String ProcessesName;
 
-	@ApiModelProperty("职务名称")
-	private String postName;
+	private String Duty;
 
-	@ApiModelProperty("角色id")
-	private Integer roleId;
+	private String Description;
 
-	@ApiModelProperty("角色名称")
-	private String roleName;
+	private String DeptName;
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysUserService.java

@@ -17,4 +17,6 @@ public interface ITSysUserService extends IService<TSysUser> {
 
 	R getLoginUser();
 
+	R getUserListByDept();
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserServiceImpl.java

@@ -8,6 +8,7 @@ import cn.wise.sc.acquisition.business.mapper.TSysPowerMapper;
 import cn.wise.sc.acquisition.business.mapper.TSysRoleMapper;
 import cn.wise.sc.acquisition.business.mapper.TSysUserMapper;
 import cn.wise.sc.acquisition.business.model.LoginUser;
+import cn.wise.sc.acquisition.business.model.vo.UserVo;
 import cn.wise.sc.acquisition.business.service.ITSysUserService;
 import cn.wise.sc.acquisition.business.util.JwtUtil;
 import cn.wise.sc.acquisition.business.util.RedisUtil;
@@ -19,8 +20,10 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -84,6 +87,20 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
 		return R.ok(loginUser);
 	}
 
+	/**
+	 * 根据单位名称人员分组
+	 * @return
+	 */
+	@Override
+	public R getUserListByDept() {
+		List<UserVo> userVoList = userMapper.getUserListByDept();
+		Map<String, List<UserVo>> map = userVoList.stream().collect(Collectors.groupingBy(UserVo::getDeptName));
+		return R.ok(map);
+	}
+
+
+
+