Przeglądaj źródła

用户信息表-政治面貌

chenshudong 4 dni temu
rodzic
commit
8291741d3f

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

@@ -158,10 +158,17 @@ public class SysUser extends BaseEntity {
158
             "CHINA_ZHI_GONG_PARTY=中国致公党," +
158
             "CHINA_ZHI_GONG_PARTY=中国致公党," +
159
             "JIU_SAN_SOCIETY=九三学社," +
159
             "JIU_SAN_SOCIETY=九三学社," +
160
             "TAIWAN_DEMOCRATIC_SELF_GOVERNMENT_LEAGUE=台湾民主自治同盟",
160
             "TAIWAN_DEMOCRATIC_SELF_GOVERNMENT_LEAGUE=台湾民主自治同盟",
161
-            combo = "中共党员,中共预备党员,共青团员,群众,中国国民党革命委员会,中国民主同盟,中国民主建国会,中国民主促进会,中国农工民主党,中国致公党,九三学社,台湾民主自治同盟")
161
+            combo = "中共党员,中共预备党员,共青团员,群众,中国国民党革命委员会,中国民主同盟,中国民主建国会,中国民主促进会,中国农工民主党,中国致公党,九三学社,台湾民主自治同盟",
162
+            type = Type.EXPORT)
162
     private String politicalStatus;
163
     private String politicalStatus;
163
 
164
 
164
     /**
165
     /**
166
+     * 政治面貌描述
167
+     */
168
+    @Excel(name = "政治面貌", type = Type.IMPORT)
169
+    private String politicalStatusDesc;
170
+
171
+    /**
165
      * 培训合规状态
172
      * 培训合规状态
166
      */
173
      */
167
     @Excel(name = "培训合规状态", readConverterExp = "0=合规,1=不合规", combo = "合规,不合规")
174
     @Excel(name = "培训合规状态", readConverterExp = "0=合规,1=不合规", combo = "合规,不合规")
@@ -754,6 +761,14 @@ public class SysUser extends BaseEntity {
754
         this.politicalStatus = politicalStatus;
761
         this.politicalStatus = politicalStatus;
755
     }
762
     }
756
 
763
 
764
+    public String getPoliticalStatusDesc() {
765
+        return politicalStatusDesc;
766
+    }
767
+
768
+    public void setPoliticalStatusDesc(String politicalStatusDesc) {
769
+        this.politicalStatusDesc = politicalStatusDesc;
770
+    }
771
+
757
     public String getTrainingComplianceStatus() {
772
     public String getTrainingComplianceStatus() {
758
         return trainingComplianceStatus;
773
         return trainingComplianceStatus;
759
     }
774
     }
@@ -1187,6 +1202,7 @@ public class SysUser extends BaseEntity {
1187
                 .append("dept", getDept())
1202
                 .append("dept", getDept())
1188
                 .append("cardNumber", getCardNumber())
1203
                 .append("cardNumber", getCardNumber())
1189
                 .append("politicalStatus", getPoliticalStatus())
1204
                 .append("politicalStatus", getPoliticalStatus())
1205
+                .append("politicalStatusDesc", getPoliticalStatusDesc())
1190
                 .append("trainingComplianceStatus", getTrainingComplianceStatus())
1206
                 .append("trainingComplianceStatus", getTrainingComplianceStatus())
1191
                 .append("qualificationLevel", getQualificationLevel())
1207
                 .append("qualificationLevel", getQualificationLevel())
1192
                 .append("administrativeStatus", getAdministrativeStatus())
1208
                 .append("administrativeStatus", getAdministrativeStatus())

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

@@ -0,0 +1,47 @@
1
+package com.sundot.airport.common.enums;
2
+
3
+import lombok.AllArgsConstructor;
4
+import lombok.Getter;
5
+
6
+/**
7
+ * 政治面貌枚举
8
+ */
9
+@Getter
10
+@AllArgsConstructor
11
+public enum SysUserPoliticalStatusEnum {
12
+
13
+    COMMUNIST_PARTY_MEMBER("COMMUNIST_PARTY_MEMBER", "中共党员"),
14
+    PROBATIONARY_COMMUNIST_PARTY_MEMBER("PROBATIONARY_COMMUNIST_PARTY_MEMBER", "中共预备党员"),
15
+    COMMUNIST_YOUTH_LEAGUE_MEMBER("COMMUNIST_YOUTH_LEAGUE_MEMBER", "共青团员"),
16
+    MASS_PUBLIC("MASS_PUBLIC", "群众"),
17
+    REVOLUTIONARY_COMMITTEE_OF_THE_CHINESE_KUOMINTANG("REVOLUTIONARY_COMMITTEE_OF_THE_CHINESE_KUOMINTANG", "中国国民党革命委员会"),
18
+    CHINA_DEMOCRATIC_LEAGUE("CHINA_DEMOCRATIC_LEAGUE", "中国民主同盟"),
19
+    CHINA_DEMOCRATIC_NATIONAL_CONSTRUCTION_ASSOCIATION("CHINA_DEMOCRATIC_NATIONAL_CONSTRUCTION_ASSOCIATION", "中国民主建国会"),
20
+    CHINA_ASSOCIATION_FOR_PROMOTING_DEMOCRACY("CHINA_ASSOCIATION_FOR_PROMOTING_DEMOCRACY", "中国民主促进会"),
21
+    CHINESE_PEASANTS_AND_WORKERS_DEMOCRATIC_PARTY("CHINESE_PEASANTS_AND_WORKERS_DEMOCRATIC_PARTY", "中国农工民主党"),
22
+    CHINA_ZHI_GONG_PARTY("CHINA_ZHI_GONG_PARTY", "中国致公党"),
23
+    JIU_SAN_SOCIETY("JIU_SAN_SOCIETY", "九三学社"),
24
+    TAIWAN_DEMOCRATIC_SELF_GOVERNMENT_LEAGUE("TAIWAN_DEMOCRATIC_SELF_GOVERNMENT_LEAGUE", "台湾民主自治同盟");
25
+
26
+    private final String code;
27
+    private final String desc;
28
+
29
+    public static SysUserPoliticalStatusEnum getByCode(String code) {
30
+        for (SysUserPoliticalStatusEnum itemEnum : values()) {
31
+            if (itemEnum.getCode().equals(code)) {
32
+                return itemEnum;
33
+            }
34
+        }
35
+        return null;
36
+    }
37
+
38
+    public static SysUserPoliticalStatusEnum getByDesc(String desc) {
39
+        for (SysUserPoliticalStatusEnum itemEnum : values()) {
40
+            if (itemEnum.getDesc().equals(desc)) {
41
+                return itemEnum;
42
+            }
43
+        }
44
+        return null;
45
+    }
46
+
47
+}

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

@@ -30,6 +30,7 @@ import com.sundot.airport.common.enums.DeptType;
30
 import com.sundot.airport.common.enums.EmploymentTypeEnum;
30
 import com.sundot.airport.common.enums.EmploymentTypeEnum;
31
 import com.sundot.airport.common.enums.PostEnum;
31
 import com.sundot.airport.common.enums.PostEnum;
32
 import com.sundot.airport.common.enums.RoleTypeEnum;
32
 import com.sundot.airport.common.enums.RoleTypeEnum;
33
+import com.sundot.airport.common.enums.SysUserPoliticalStatusEnum;
33
 import com.sundot.airport.common.enums.SysYesNoEnum;
34
 import com.sundot.airport.common.enums.SysYesNoEnum;
34
 import com.sundot.airport.common.enums.WorkAreaEnum;
35
 import com.sundot.airport.common.enums.WorkAreaEnum;
35
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
36
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
@@ -509,6 +510,9 @@ public class SysUserServiceImpl implements ISysUserService {
509
                     String password = configService.selectConfigByKey("sys.user.initPassword");
510
                     String password = configService.selectConfigByKey("sys.user.initPassword");
510
                     user.setPassword(SecurityUtils.encryptPassword(password));
511
                     user.setPassword(SecurityUtils.encryptPassword(password));
511
                     user.setCreateBy(operName);
512
                     user.setCreateBy(operName);
513
+                    if (StringUtils.isNotEmpty(user.getPoliticalStatusDesc())) {
514
+                        user.setPoliticalStatus(SysUserPoliticalStatusEnum.getByDesc(user.getPoliticalStatusDesc()).getCode());
515
+                    }
512
                     if (StringUtils.isNotEmpty(user.getAssessmentTeamDesc())) {
516
                     if (StringUtils.isNotEmpty(user.getAssessmentTeamDesc())) {
513
                         user.setAssessmentTeam(AssessmentTeamEnum.getByDesc(user.getAssessmentTeamDesc()).getCode());
517
                         user.setAssessmentTeam(AssessmentTeamEnum.getByDesc(user.getAssessmentTeamDesc()).getCode());
514
                     }
518
                     }
@@ -534,6 +538,9 @@ public class SysUserServiceImpl implements ISysUserService {
534
                     deptService.checkDeptDataScope(user.getDeptId());
538
                     deptService.checkDeptDataScope(user.getDeptId());
535
                     user.setUserId(u.getUserId());
539
                     user.setUserId(u.getUserId());
536
                     user.setUpdateBy(operName);
540
                     user.setUpdateBy(operName);
541
+                    if (StringUtils.isNotEmpty(user.getPoliticalStatusDesc())) {
542
+                        user.setPoliticalStatus(SysUserPoliticalStatusEnum.getByDesc(user.getPoliticalStatusDesc()).getCode());
543
+                    }
537
                     if (StringUtils.isNotEmpty(user.getAssessmentTeamDesc())) {
544
                     if (StringUtils.isNotEmpty(user.getAssessmentTeamDesc())) {
538
                         user.setAssessmentTeam(AssessmentTeamEnum.getByDesc(user.getAssessmentTeamDesc()).getCode());
545
                         user.setAssessmentTeam(AssessmentTeamEnum.getByDesc(user.getAssessmentTeamDesc()).getCode());
539
                     }
546
                     }