用户信息表-政治面貌

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

@@ -158,10 +158,17 @@ public class SysUser extends BaseEntity {
             "CHINA_ZHI_GONG_PARTY=中国致公党," +
             "JIU_SAN_SOCIETY=九三学社," +
             "TAIWAN_DEMOCRATIC_SELF_GOVERNMENT_LEAGUE=台湾民主自治同盟",
-            combo = "中共党员,中共预备党员,共青团员,群众,中国国民党革命委员会,中国民主同盟,中国民主建国会,中国民主促进会,中国农工民主党,中国致公党,九三学社,台湾民主自治同盟")
+            combo = "中共党员,中共预备党员,共青团员,群众,中国国民党革命委员会,中国民主同盟,中国民主建国会,中国民主促进会,中国农工民主党,中国致公党,九三学社,台湾民主自治同盟",
+            type = Type.EXPORT)
     private String politicalStatus;
 
     /**
+     * 政治面貌描述
+     */
+    @Excel(name = "政治面貌", type = Type.IMPORT)
+    private String politicalStatusDesc;
+
+    /**
      * 培训合规状态
      */
     @Excel(name = "培训合规状态", readConverterExp = "0=合规,1=不合规", combo = "合规,不合规")
@@ -754,6 +761,14 @@ public class SysUser extends BaseEntity {
         this.politicalStatus = politicalStatus;
     }
 
+    public String getPoliticalStatusDesc() {
+        return politicalStatusDesc;
+    }
+
+    public void setPoliticalStatusDesc(String politicalStatusDesc) {
+        this.politicalStatusDesc = politicalStatusDesc;
+    }
+
     public String getTrainingComplianceStatus() {
         return trainingComplianceStatus;
     }
@@ -1187,6 +1202,7 @@ public class SysUser extends BaseEntity {
                 .append("dept", getDept())
                 .append("cardNumber", getCardNumber())
                 .append("politicalStatus", getPoliticalStatus())
+                .append("politicalStatusDesc", getPoliticalStatusDesc())
                 .append("trainingComplianceStatus", getTrainingComplianceStatus())
                 .append("qualificationLevel", getQualificationLevel())
                 .append("administrativeStatus", getAdministrativeStatus())

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

@@ -0,0 +1,47 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 政治面貌枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum SysUserPoliticalStatusEnum {
+
+    COMMUNIST_PARTY_MEMBER("COMMUNIST_PARTY_MEMBER", "中共党员"),
+    PROBATIONARY_COMMUNIST_PARTY_MEMBER("PROBATIONARY_COMMUNIST_PARTY_MEMBER", "中共预备党员"),
+    COMMUNIST_YOUTH_LEAGUE_MEMBER("COMMUNIST_YOUTH_LEAGUE_MEMBER", "共青团员"),
+    MASS_PUBLIC("MASS_PUBLIC", "群众"),
+    REVOLUTIONARY_COMMITTEE_OF_THE_CHINESE_KUOMINTANG("REVOLUTIONARY_COMMITTEE_OF_THE_CHINESE_KUOMINTANG", "中国国民党革命委员会"),
+    CHINA_DEMOCRATIC_LEAGUE("CHINA_DEMOCRATIC_LEAGUE", "中国民主同盟"),
+    CHINA_DEMOCRATIC_NATIONAL_CONSTRUCTION_ASSOCIATION("CHINA_DEMOCRATIC_NATIONAL_CONSTRUCTION_ASSOCIATION", "中国民主建国会"),
+    CHINA_ASSOCIATION_FOR_PROMOTING_DEMOCRACY("CHINA_ASSOCIATION_FOR_PROMOTING_DEMOCRACY", "中国民主促进会"),
+    CHINESE_PEASANTS_AND_WORKERS_DEMOCRATIC_PARTY("CHINESE_PEASANTS_AND_WORKERS_DEMOCRATIC_PARTY", "中国农工民主党"),
+    CHINA_ZHI_GONG_PARTY("CHINA_ZHI_GONG_PARTY", "中国致公党"),
+    JIU_SAN_SOCIETY("JIU_SAN_SOCIETY", "九三学社"),
+    TAIWAN_DEMOCRATIC_SELF_GOVERNMENT_LEAGUE("TAIWAN_DEMOCRATIC_SELF_GOVERNMENT_LEAGUE", "台湾民主自治同盟");
+
+    private final String code;
+    private final String desc;
+
+    public static SysUserPoliticalStatusEnum getByCode(String code) {
+        for (SysUserPoliticalStatusEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+    public static SysUserPoliticalStatusEnum getByDesc(String desc) {
+        for (SysUserPoliticalStatusEnum itemEnum : values()) {
+            if (itemEnum.getDesc().equals(desc)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -30,6 +30,7 @@ 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;
@@ -509,6 +510,9 @@ 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());
                     }
@@ -534,6 +538,9 @@ 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());
                     }