用户编辑

web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java

@@ -85,11 +85,17 @@ public class UserAddCmd extends Command {
 
     @ApiModelProperty(value = "户口所在地", name = "locationAddress")
     private String locationAddress;
+    @ApiModelProperty(value = "职级", name = "rank")
+    private String rank;
+    @ApiModelProperty(value = "职级名称", name = "rank_name")
+    private String rank_name;
 
     // TODO 待确认企业端和监管端是否必填
     @ApiModelProperty(value = "人员在部门中的排序", name = "sort")
     private Integer sort;
 
+    @ApiModelProperty(value = "描述", name = "remarks")
+    private String remarks;
     @ApiModelProperty(value = "是否部门领导0否1是", name = "departmentLeaderFlag")
     private Integer departmentLeaderFlag;
 

web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java

@@ -27,57 +27,65 @@ public class UserUpdateCmd extends Command {
     @ApiModelProperty(value = "业务主键id老系统id", name = "userId", required = true)
     @NotEmpty(message = "业务主键id老系统id不能为空")
     private String userId;
-    @ApiModelProperty(value = "登录账号", name = "username", required = true)
+    @ApiModelProperty(value = "登录账号", name = "username")
     private String username;
-    @ApiModelProperty(value = "姓名", name = "name", required = true)
+    @ApiModelProperty(value = "姓名", name = "name")
     private String name;
-    @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true)
+    @ApiModelProperty(value = "企业id", name = "corpinfoId")
     private Long corpinfoId;
-    @ApiModelProperty(value = "是否主账号1是0否", name = "mainCorpFlag", required = true)
+    @ApiModelProperty(value = "是否主账号1是0否", name = "mainCorpFlag")
     private Integer mainCorpFlag;
-    @ApiModelProperty(value = "用户类型,1监管2企业3相关方", name = "userType", required = true)
+    @ApiModelProperty(value = "用户类型,1监管2企业3相关方", name = "userType")
     private Integer userType;
-    @ApiModelProperty(value = "部门id", name = "departmentId", required = true)
+    @ApiModelProperty(value = "部门id", name = "departmentId")
     private Long departmentId;
-    @ApiModelProperty(value = "岗位id", name = "postId", required = true)
+    @ApiModelProperty(value = "岗位id", name = "postId")
     private Long postId;
-    @ApiModelProperty(value = "角色id", name = "roleId", required = true)
+    @ApiModelProperty(value = "角色id", name = "roleId")
     private Long roleId;
-    @ApiModelProperty(value = "邮箱", name = "email", required = true)
+    @ApiModelProperty(value = "邮箱", name = "email")
     private String email;
-    @ApiModelProperty(value = "人员类型编码（主要负责人等）", name = "personnelType", required = true)
+    @ApiModelProperty(value = "人员类型编码（主要负责人等）", name = "personnelType")
     private String personnelType;
-    @ApiModelProperty(value = "人员类型翻译", name = "personnelTypeName", required = true)
+    @ApiModelProperty(value = "人员类型翻译", name = "personnelTypeName")
     private String personnelTypeName;
-    @ApiModelProperty(value = "民族编码问一下有没有组件", name = "nation", required = true)
+    @ApiModelProperty(value = "民族编码问一下有没有组件", name = "nation")
     private String nation;
-    @ApiModelProperty(value = "民族名称", name = "nationName", required = true)
+    @ApiModelProperty(value = "民族名称", name = "nationName")
     private String nationName;
-    @ApiModelProperty(value = "身份证号", name = "userIdCard", required = true)
+    @ApiModelProperty(value = "身份证号", name = "userIdCard")
     private String userIdCard;
-    @ApiModelProperty(value = "人脸头像url", name = "userAvatarUrl", required = true)
+    @ApiModelProperty(value = "人脸头像url", name = "userAvatarUrl")
     private String userAvatarUrl;
-    @ApiModelProperty(value = "现住址", name = "currentAddress", required = true)
+    @ApiModelProperty(value = "现住址", name = "currentAddress")
     private String currentAddress;
-    @ApiModelProperty(value = "户口所在地", name = "locationAddress", required = true)
+    @ApiModelProperty(value = "户口所在地", name = "locationAddress")
     private String locationAddress;
-    @ApiModelProperty(value = "人员在部门中的排序", name = "sort", required = true)
+    @ApiModelProperty(value = "手机号", name = "phone")
+    private String phone;
+    @ApiModelProperty(value = "职级", name = "rank")
+    private String rank;
+    @ApiModelProperty(value = "职级名称", name = "rank_name")
+    private String rank_name;
+    @ApiModelProperty(value = "人员在部门中的排序", name = "sort")
     private Integer sort;
-    @ApiModelProperty(value = "是否部门领导0否1是", name = "departmentLeaderFlag", required = true)
+    @ApiModelProperty(value = "描述", name = "remarks")
+    private String remarks;
+    @ApiModelProperty(value = "是否部门领导0否1是", name = "departmentLeaderFlag")
     private Integer departmentLeaderFlag;
-    @ApiModelProperty(value = "是否分管领导0否1是", name = "deputyLeaderFlag", required = true)
+    @ApiModelProperty(value = "是否分管领导0否1是", name = "deputyLeaderFlag")
     private Integer deputyLeaderFlag;
-    @ApiModelProperty(value = "文化程度 数据字典", name = "culturalLevel", required = true)
+    @ApiModelProperty(value = "文化程度 数据字典", name = "culturalLevel")
     private String culturalLevel;
-    @ApiModelProperty(value = "文化程度名称", name = "culturalLevelName", required = true)
+    @ApiModelProperty(value = "文化程度名称", name = "culturalLevelName")
     private String culturalLevelName;
-    @ApiModelProperty(value = "婚姻状态", name = "maritalStatus", required = true)
+    @ApiModelProperty(value = "婚姻状态", name = "maritalStatus")
     private String maritalStatus;
-    @ApiModelProperty(value = "婚姻状态名称", name = "maritalStatusName", required = true)
+    @ApiModelProperty(value = "婚姻状态名称", name = "maritalStatusName")
     private String maritalStatusName;
-    @ApiModelProperty(value = "政治面貌", name = "politicalAffiliation", required = true)
+    @ApiModelProperty(value = "政治面貌", name = "politicalAffiliation")
     private String politicalAffiliation;
-    @ApiModelProperty(value = "政治面貌名称", name = "politicalAffiliationName", required = true)
+    @ApiModelProperty(value = "政治面貌名称", name = "politicalAffiliationName")
     private String politicalAffiliationName;
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java

@@ -88,10 +88,16 @@ public class UserXgfAddCmd extends Command {
     @ApiModelProperty(value = "户口所在地", name = "locationAddress", required = true)
     @NotEmpty(message = "户口所在地不能为空")
     private String locationAddress;
+    @ApiModelProperty(value = "职级", name = "rank")
+    private String rank;
+    @ApiModelProperty(value = "职级名称", name = "rank_name")
+    private String rank_name;
 
     @ApiModelProperty(value = "人员在部门中的排序", name = "sort")
     private Integer sort;
 
+    @ApiModelProperty(value = "描述", name = "remarks")
+    private String remarks;
     @ApiModelProperty(value = "是否部门领导0否1是", name = "departmentLeaderFlag")
     private Integer departmentLeaderFlag;
 

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java

@@ -92,6 +92,13 @@ public class UserCO extends ClientObject {
     //户口所在地
     @ApiModelProperty(value = "户口所在地")
     private String locationAddress;
+
+    @ApiModelProperty(value = "职级")
+    private String rank;
+    @ApiModelProperty(value = "职级名称")
+    private String rank_name;
+    @ApiModelProperty(value = "手机号")
+    private String phone;
     //人员在部门中的排序
     @ApiModelProperty(value = "人员在部门中的排序")
     private Integer sort;

web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java

@@ -5,6 +5,7 @@ import com.jjb.saas.framework.domain.model.BaseE;
 import com.zcloud.gbscommon.utils.DateUtil;
 import com.zcloud.gbscommon.utils.FileUpload;
 import com.zcloud.gbscommon.utils.Tools;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -57,6 +58,11 @@ public class UserE extends BaseE {
     private String currentAddress;
     //户口所在地
     private String locationAddress;
+
+    private String rank;
+    private String phone;
+
+    private String rank_name;
     //人员在部门中的排序
     private Integer sort;
     //乐观锁

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java

@@ -83,9 +83,17 @@ public class UserDO extends BaseDO {
     //现住址
     @ApiModelProperty(value = "现住址")
     private String currentAddress;
+    @ApiModelProperty(value = "描述")
+    private String remarks;
     //户口所在地
     @ApiModelProperty(value = "户口所在地")
     private String locationAddress;
+    @ApiModelProperty(value = "职级")
+    private String rank;
+    @ApiModelProperty(value = "职级名称")
+    private String rank_name;
+    @ApiModelProperty(value = "手机号")
+    private String phone;
     //人员在部门中的排序
     @ApiModelProperty(value = "人员在部门中的排序")
     private Integer sort;

web-infrastructure/src/main/resources/mapper/UserMapper.xml

@@ -28,7 +28,11 @@
         u.create_name,
         u.create_time,
         u.tenant_id,
-        u.org_id
+        u.org_id,
+        CASE
+        WHEN MOD(SUBSTRING( u.user_id_card, 17, 1), 2) = 1 THEN '男'
+        ELSE '女'
+        END AS sex
         from user u
         left join corp_info c on c.id = u.corpinfo_id
         left join department d on d.id = u.department_id
@@ -74,7 +78,11 @@
         u.create_name,
         u.create_time,
         u.tenant_id,
-        u.org_id
+        u.org_id,
+        CASE
+            WHEN MOD(SUBSTRING( u.user_id_card, 17, 1), 2) = 1 THEN '男'
+            ELSE '女'
+            END AS sex
         from user u
         left join corp_info c on c.id = u.corpinfo_id
         left join department d on d.id = u.department_id
@@ -126,7 +134,11 @@
         u.marital_status,
         u.marital_status_name,
         u.political_affiliation,
-        u.political_affiliation_name
+        u.political_affiliation_name,
+        CASE
+        WHEN MOD(SUBSTRING( u.user_id_card, 17, 1), 2) = 1 THEN '男'
+        ELSE '女'
+        END AS sex
         from user u
         left join corp_info c on c.id = u.corpinfo_id
         left join department d on d.id = u.department_id