查询人事绩效用户列表

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -20,8 +20,11 @@ import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
 import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.SysLargeScreenWorkingPortraitDto;
+import com.sundot.airport.common.dto.SysDeptDto;
 import com.sundot.airport.common.dto.SysPersonnelUserConditionDto;
+import com.sundot.airport.common.dto.SysRoleDto;
 import com.sundot.airport.common.dto.SysUserConditionDto;
+import com.sundot.airport.common.dto.SysUserDto;
 import com.sundot.airport.common.dto.SysUserLeaderConditionDto;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.exam.domain.DailyTask;
@@ -166,11 +169,67 @@ public class SysUserController extends BaseController {
      */
     @PostMapping("/selectPersonnelUserList")
     public AjaxResult selectPersonnelUserList(@RequestBody SysPersonnelUserConditionDto dto) {
-        List<SysUser> result = userService.selectPersonnelUserList(dto);
+        List<SysUser> sysUserList = userService.selectPersonnelUserList(dto);
+        List<SysUserDto> result = sysUserList.stream()
+                .filter(Objects::nonNull)
+                .map(this::convertToSysUserDto)
+                .collect(Collectors.toList());
         return success(result);
     }
 
     /**
+     * 转化简化版用户详细信息
+     */
+    private SysUserDto convertToSysUserDto(SysUser sysUser) {
+        SysUserDto sysUserDto = new SysUserDto();
+        sysUserDto.setUserId(sysUser.getUserId());
+        sysUserDto.setUserName(sysUser.getUserName());
+        sysUserDto.setNickName(sysUser.getNickName());
+        sysUserDto.setDeptId(sysUser.getDeptId());
+        sysUserDto.setEmploymentType(sysUser.getEmploymentType());
+        sysUserDto.setAssessmentTeam(sysUser.getAssessmentTeam());
+        sysUserDto.setPost(sysUser.getPost());
+        sysUserDto.setWorkArea(sysUser.getWorkArea());
+        sysUserDto.setTakeAssessment(sysUser.getTakeAssessment());
+        sysUserDto.setExemptTakeAssessmentStartTime(sysUser.getExemptTakeAssessmentStartTime());
+        sysUserDto.setExemptTakeAssessmentEndTime(sysUser.getExemptTakeAssessmentEndTime());
+        sysUserDto.setExemptTakeAssessmentRemark(sysUser.getExemptTakeAssessmentRemark());
+        if (ObjectUtil.isNotNull(sysUser.getDept())) {
+            sysUserDto.setDept(convertToSysDeptDto(sysUser.getDept()));
+        }
+        if (CollUtil.isNotEmpty(sysUser.getRoles())) {
+            List<SysRoleDto> roles = sysUser.getRoles().stream()
+                    .filter(Objects::nonNull)
+                    .map(this::convertToSysRoleDto)
+                    .collect(Collectors.toList());
+            sysUserDto.setRoles(roles);
+        }
+        return sysUserDto;
+    }
+
+    /**
+     * 转化简化版部门信息
+     */
+    private SysDeptDto convertToSysDeptDto(SysDept sysDept) {
+        SysDeptDto sysDeptDto = new SysDeptDto();
+        sysDeptDto.setDeptId(sysDept.getDeptId());
+        sysDeptDto.setDeptName(sysDept.getDeptName());
+        sysDeptDto.setParentId(sysDept.getParentId());
+        return sysDeptDto;
+    }
+
+    /**
+     * 转化简化版角色信息
+     */
+    private SysRoleDto convertToSysRoleDto(SysRole sysRole) {
+        SysRoleDto sysRoleDto = new SysRoleDto();
+        sysRoleDto.setRoleId(sysRole.getRoleId());
+        sysRoleDto.setRoleName(sysRole.getRoleName());
+        sysRoleDto.setRoleKey(sysRole.getRoleKey());
+        return sysRoleDto;
+    }
+
+    /**
      * 能力画像-协同配合
      */
     @Cacheable(

airport-common/src/main/java/com/sundot/airport/common/dto/SysDeptDto.java

@@ -0,0 +1,49 @@
+package com.sundot.airport.common.dto;
+
+/**
+ * 部门表Dto
+ *
+ * @author ruoyi
+ */
+public class SysDeptDto {
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 父部门ID
+     */
+    private Long parentId;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+}

airport-common/src/main/java/com/sundot/airport/common/dto/SysRoleDto.java

@@ -0,0 +1,28 @@
+package com.sundot.airport.common.dto;
+
+import lombok.Data;
+
+/**
+ * 角色表Dto
+ *
+ * @author ruoyi
+ */
+@Data
+public class SysRoleDto {
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色权限
+     */
+    private String roleKey;
+
+}

airport-common/src/main/java/com/sundot/airport/common/dto/SysUserDto.java

@@ -0,0 +1,92 @@
+package com.sundot.airport.common.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户对象Dto
+ *
+ * @author ruoyi
+ */
+@Data
+public class SysUserDto {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用工形式
+     */
+    private String employmentType;
+
+    /**
+     * 考核组
+     */
+    private String assessmentTeam;
+
+    /**
+     * 岗位
+     */
+    private String post;
+
+    /**
+     * 工作区域
+     */
+    private String workArea;
+
+    /**
+     * 是否参加考核（Y=是,N=否）
+     */
+    private String takeAssessment;
+
+    /**
+     * 免考核开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date exemptTakeAssessmentStartTime;
+
+    /**
+     * 免考核结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date exemptTakeAssessmentEndTime;
+
+    /**
+     * 免考核备注
+     */
+    private String exemptTakeAssessmentRemark;
+
+    /**
+     * 部门对象
+     */
+    private SysDeptDto dept;
+
+    /**
+     * 角色对象
+     */
+    private List<SysRoleDto> roles;
+
+}