用户信息表

airport-common/src/main/java/com/sundot/airport/common/enums/EmploymentTypeEnum.java

@@ -11,8 +11,8 @@ import lombok.Getter;
 public enum EmploymentTypeEnum {
 
     DISPATCHED_WORKER("DISPATCHED_WORKER", "派遣工"),
-    TEAM_LEADER("REGULAR_EMPLOYEE", "正式工"),
-    INTERN("INTERN", "实习生（不参与考核）");
+    REGULAR_EMPLOYEE("REGULAR_EMPLOYEE", "正式工"),
+    INTERN("INTERN", "实习生");
 
     private final String code;
     private final String desc;

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -26,14 +26,8 @@ import com.sundot.airport.common.core.domain.entity.SysDictData;
 import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.common.dto.SysUserLeaderConditionDto;
 import com.sundot.airport.common.dto.UserInfo;
-import com.sundot.airport.common.enums.AssessmentTeamEnum;
 import com.sundot.airport.common.enums.DeptType;
-import com.sundot.airport.common.enums.EmploymentTypeEnum;
-import com.sundot.airport.common.enums.PostEnum;
 import com.sundot.airport.common.enums.RoleTypeEnum;
-import com.sundot.airport.common.enums.SysUserPoliticalStatusEnum;
-import com.sundot.airport.common.enums.SysYesNoEnum;
-import com.sundot.airport.common.enums.WorkAreaEnum;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationItemDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationQueryParamDto;
@@ -112,7 +106,75 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
-        return userMapper.selectUserList(user);
+        List<SysUser> result = userMapper.selectUserList(user);
+        // 政治面貌字典数据
+        Map<String, String> politicalStatusDictDataMap = getDictDataKeyValueMap("sys_user_political_status");
+        // 考核组字典数据
+        Map<String, String> assessmentTeamDictDataMap = getDictDataKeyValueMap("assessment_team");
+        // 用工形式字典数据
+        Map<String, String> employmentTypeDictDataMap = getDictDataKeyValueMap("employment_type");
+        // 是否字典数据
+        Map<String, String> yesNoDictDataMap = getDictDataKeyValueMap("sys_yes_no");
+        // 岗位字典数据
+        Map<String, String> postDictDataMap = getDictDataKeyValueMap("post");
+        // 工作区域字典数据
+        Map<String, String> workAreaDictDataMap = getDictDataKeyValueMap("work_area");
+        // 补充字典数据
+        result.forEach(item -> {
+            // 政治面貌
+            if (StrUtil.isNotEmpty(item.getPoliticalStatus())) {
+                item.setPoliticalStatusDesc(politicalStatusDictDataMap.get(item.getPoliticalStatus()));
+            }
+            // 考核组
+            if (StrUtil.isNotEmpty(item.getAssessmentTeam())) {
+                item.setAssessmentTeamDesc(assessmentTeamDictDataMap.get(item.getAssessmentTeam()));
+            }
+            // 用工形式
+            if (StrUtil.isNotEmpty(item.getEmploymentType())) {
+                item.setEmploymentTypeDesc(employmentTypeDictDataMap.get(item.getEmploymentType()));
+            }
+            // 是否参加考核
+            if (StrUtil.isNotEmpty(item.getTakeAssessment())) {
+                item.setTakeAssessmentDesc(yesNoDictDataMap.get(item.getTakeAssessment()));
+            }
+            // 岗位
+            if (StrUtil.isNotEmpty(item.getPost())) {
+                item.setPostDesc(postDictDataMap.get(item.getPost()));
+            }
+            // 工作区域
+            if (StrUtil.isNotEmpty(item.getWorkArea())) {
+                item.setWorkAreaDesc(workAreaDictDataMap.get(item.getWorkArea()));
+            }
+        });
+        return result;
+    }
+
+    /**
+     * 获取字典数据
+     *
+     * @param dictType 字典类型
+     * @return 字典数据
+     */
+    private Map<String, String> getDictDataKeyValueMap(String dictType) {
+        SysDictData dictData = new SysDictData();
+        dictData.setDictType(dictType);
+        List<SysDictData> dictDataList = sysDictDataService.selectDictDataList(dictData);
+        Map<String, String> dictDataMap = dictDataList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
+        return dictDataMap;
+    }
+
+    /**
+     * 获取字典数据
+     *
+     * @param dictType 字典类型
+     * @return 字典数据
+     */
+    private Map<String, String> getDictDataValueKeyMap(String dictType) {
+        SysDictData dictData = new SysDictData();
+        dictData.setDictType(dictType);
+        List<SysDictData> dictDataList = sysDictDataService.selectDictDataList(dictData);
+        Map<String, String> dictDataMap = dictDataList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+        return dictDataMap;
     }
 
     /**
@@ -497,12 +559,76 @@ public class SysUserServiceImpl implements ISysUserService {
         if (StringUtils.isNull(userList) || userList.size() == 0) {
             throw new ServiceException("导入用户数据不能为空！");
         }
+
+        // 政治面貌字典数据
+        Map<String, String> politicalStatusDictDataMap = getDictDataValueKeyMap("sys_user_political_status");
+        // 考核组字典数据
+        Map<String, String> assessmentTeamDictDataMap = getDictDataValueKeyMap("assessment_team");
+        // 用工形式字典数据
+        Map<String, String> employmentTypeDictDataMap = getDictDataValueKeyMap("employment_type");
+        // 是否字典数据
+        Map<String, String> yesNoDictDataMap = getDictDataValueKeyMap("sys_yes_no");
+        // 岗位字典数据
+        Map<String, String> postDictDataMap = getDictDataValueKeyMap("post");
+        // 工作区域字典数据
+        Map<String, String> workAreaDictDataMap = getDictDataValueKeyMap("work_area");
+
         int successNum = 0;
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         for (SysUser user : userList) {
             try {
+                // 数据校验
+                if (StrUtil.isNotEmpty(user.getPoliticalStatusDesc())) {
+                    user.setPoliticalStatus(politicalStatusDictDataMap.get(user.getPoliticalStatusDesc()));
+                    if (ObjUtil.isNull(user.getPoliticalStatus())) {
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 政治面貌字段值输入错误");
+                        continue;
+                    }
+                }
+                if (StrUtil.isNotEmpty(user.getAssessmentTeamDesc())) {
+                    user.setAssessmentTeam(assessmentTeamDictDataMap.get(user.getAssessmentTeamDesc()));
+                    if (ObjUtil.isNull(user.getAssessmentTeam())) {
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 考核组字段值输入错误");
+                        continue;
+                    }
+                }
+                if (StrUtil.isNotEmpty(user.getEmploymentTypeDesc())) {
+                    user.setEmploymentType(employmentTypeDictDataMap.get(user.getEmploymentTypeDesc()));
+                    if (ObjUtil.isNull(user.getEmploymentType())) {
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 用工形式字段值输入错误");
+                        continue;
+                    }
+                }
+                if (StrUtil.isNotEmpty(user.getTakeAssessmentDesc())) {
+                    user.setTakeAssessment(yesNoDictDataMap.get(user.getTakeAssessmentDesc()));
+                    if (ObjUtil.isNull(user.getTakeAssessment())) {
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 是否参加考核字段值输入错误");
+                        continue;
+                    }
+                }
+                if (StrUtil.isNotEmpty(user.getPostDesc())) {
+                    user.setPost(postDictDataMap.get(user.getPostDesc()));
+                    if (ObjUtil.isNull(user.getPost())) {
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 岗位字段值输入错误");
+                        continue;
+                    }
+                }
+                if (StrUtil.isNotEmpty(user.getWorkAreaDesc())) {
+                    user.setWorkArea(workAreaDictDataMap.get(user.getWorkAreaDesc()));
+                    if (ObjUtil.isNull(user.getWorkArea())) {
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 工作区域字段值输入错误");
+                        continue;
+                    }
+                }
+
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
                 if (StringUtils.isNull(u)) {
@@ -511,24 +637,6 @@ public class SysUserServiceImpl implements ISysUserService {
                     String password = configService.selectConfigByKey("sys.user.initPassword");
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
-                    if (StringUtils.isNotEmpty(user.getPoliticalStatusDesc())) {
-                        user.setPoliticalStatus(SysUserPoliticalStatusEnum.getByDesc(user.getPoliticalStatusDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getAssessmentTeamDesc())) {
-                        user.setAssessmentTeam(AssessmentTeamEnum.getByDesc(user.getAssessmentTeamDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getEmploymentTypeDesc())) {
-                        user.setEmploymentType(EmploymentTypeEnum.getByDesc(user.getEmploymentTypeDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getTakeAssessmentDesc())) {
-                        user.setTakeAssessment(SysYesNoEnum.getByDesc(user.getTakeAssessmentDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getPostDesc())) {
-                        user.setPost(PostEnum.getByDesc(user.getPostDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getWorkAreaDesc())) {
-                        user.setWorkArea(WorkAreaEnum.getByDesc(user.getWorkAreaDesc()).getCode());
-                    }
                     userMapper.insertUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
@@ -539,24 +647,6 @@ public class SysUserServiceImpl implements ISysUserService {
                     deptService.checkDeptDataScope(user.getDeptId());
                     user.setUserId(u.getUserId());
                     user.setUpdateBy(operName);
-                    if (StringUtils.isNotEmpty(user.getPoliticalStatusDesc())) {
-                        user.setPoliticalStatus(SysUserPoliticalStatusEnum.getByDesc(user.getPoliticalStatusDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getAssessmentTeamDesc())) {
-                        user.setAssessmentTeam(AssessmentTeamEnum.getByDesc(user.getAssessmentTeamDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getEmploymentTypeDesc())) {
-                        user.setEmploymentType(EmploymentTypeEnum.getByDesc(user.getEmploymentTypeDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getTakeAssessmentDesc())) {
-                        user.setTakeAssessment(SysYesNoEnum.getByDesc(user.getTakeAssessmentDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getPostDesc())) {
-                        user.setPost(PostEnum.getByDesc(user.getPostDesc()).getCode());
-                    }
-                    if (StringUtils.isNotEmpty(user.getWorkAreaDesc())) {
-                        user.setWorkArea(WorkAreaEnum.getByDesc(user.getWorkAreaDesc()).getCode());
-                    }
                     userMapper.updateUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");