Browse Source

20220825
人力资源管理-用户信息实体类修改

sunruiqi 2 năm trước cách đây
mục cha
commit
d7b080ccb4

+ 1 - 1
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserAchievement.java

@@ -40,7 +40,7 @@ public class SysUserAchievement extends BaseEntity {
 
     // 担任职务
     @TableField("post")
-    private Short post;
+    private String post;
 
     // 参与内容
     @TableField("content")

+ 2 - 2
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserCertificate.java

@@ -32,11 +32,11 @@ public class SysUserCertificate extends BaseEntity {
 
     // 注册日期
     @TableField("regine_date")
-    private Date regineDate;
+    private String regineDate;
 
     // 发证日期
     @TableField("issue_date")
-    private Date issueDate;
+    private String issueDate;
 
     // 发证机关
     @TableField("Issuing_authority")

+ 5 - 5
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserContract.java

@@ -24,7 +24,7 @@ public class SysUserContract extends BaseEntity {
 
     // 合同类型
     @TableField("contract_type")
-    private Short contractType;
+    private String contractType;
 
     // 合同编号
     @TableField("contract_number")
@@ -36,19 +36,19 @@ public class SysUserContract extends BaseEntity {
 
     // 合同起始日期
     @TableField("contract_begin_date")
-    private Date contractBeginDate;
+    private String contractBeginDate;
 
     // 合同终止日期
     @TableField("contract_end_date")
-    private Date contractEndDate;
+    private String contractEndDate;
 
     // 试用期结束日期
     @TableField("probation_end_date")
-    private Date probationEndDate;
+    private String probationEndDate;
 
     // 办理日期
     @TableField("processing_date")
-    private Date processingDate;
+    private String processingDate;
 
     // 文件地址
     @TableField("file_url")

+ 2 - 2
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserDuties.java

@@ -28,11 +28,11 @@ public class SysUserDuties extends BaseEntity {
 
     // 任职开始日期
     @TableField("post_begin_date")
-    private Date postBeginDate;
+    private String postBeginDate;
 
     // 任职结束日期
     @TableField("post_end_date")
-    private Date postEndDate;
+    private String postEndDate;
 
     // 任职机构
     @TableField("post_office")

+ 5 - 5
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserEducation.java

@@ -32,23 +32,23 @@ public class SysUserEducation extends BaseEntity {
 
     // 学历
     @TableField("education")
-    private Integer education;
+    private String education;
 
     // 学位
     @TableField("degree")
-    private Integer degree;
+    private String degree;
 
     // 学历性质
     @TableField("education_type")
-    private Integer educationType;
+    private String educationType;
 
     // 入学日期
     @TableField("entrance_date")
-    private Date entranceDate;
+    private String entranceDate;
 
     // 毕业日期
     @TableField("graduation_date")
-    private Date graduationDate;
+    private String graduationDate;
 
     // 学历证书地址
     @TableField("education_certificate_url")

+ 1 - 1
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserFamily.java

@@ -36,7 +36,7 @@ public class SysUserFamily extends BaseEntity {
 
     // 成员性别
     @TableField("sex")
-    private Short sex;
+    private String sex;
 
     // 成员联系方式
     @TableField("linkman_phone")

+ 9 - 9
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserInfo.java

@@ -30,11 +30,11 @@ public class SysUserInfo extends BaseEntity {
 
     // 性别
     @TableField("sex")
-    private Short sex;
+    private String sex;
 
     // 民族
     @TableField("nation")
-    private Short nation;
+    private String nation;
 
     // 身份证号码
     @TableField("id_card")
@@ -46,7 +46,7 @@ public class SysUserInfo extends BaseEntity {
 
     // 出生日期
     @TableField("birthday")
-    private Date birthday;
+    private String birthday;
 
     // 电子邮箱
     @TableField("e_mail")
@@ -63,7 +63,7 @@ public class SysUserInfo extends BaseEntity {
 
     // 员工状态
     @TableField("user_type")
-    private Short userType;
+    private String userType;
 
     // 银行卡号
     @TableField("bank_number")
@@ -71,15 +71,15 @@ public class SysUserInfo extends BaseEntity {
 
     // 婚姻状态
     @TableField("marital_status")
-    private Short maritalStatus;
+    private String maritalStatus;
 
     // 政治面貌
     @TableField("political_outlook")
-    private Short politicalOutlook;
+    private String politicalOutlook;
 
     // 籍贯
     @TableField("native_place")
-    private Byte nativePlace;
+    private String nativePlace;
 
     // 户口所在地
     @TableField("registered_residence")
@@ -111,7 +111,7 @@ public class SysUserInfo extends BaseEntity {
 
     // 入职时间
     @TableField("entry_date")
-    private Date entryDate;
+    private String entryDate;
 
     // 试用岗位
     @TableField("probation_position")
@@ -123,7 +123,7 @@ public class SysUserInfo extends BaseEntity {
 
     // 试用期结束日期
     @TableField("probation_end_date")
-    private Date probationEndDate;
+    private String probationEndDate;
 
     // 所属部门
     @TableField("department")

+ 1 - 1
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserLanguages.java

@@ -36,7 +36,7 @@ public class SysUserLanguages extends BaseEntity {
 
     // 获证日期
     @TableField("get_date")
-    private Date getDate;
+    private String getDate;
 
     // 文件url
     @TableField("file_url")

+ 1 - 1
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserRewards.java

@@ -24,7 +24,7 @@ public class SysUserRewards extends BaseEntity {
 
     // 奖惩类型
     @TableField("rewards_type")
-    private Short rewardsType;
+    private String rewardsType;
 
     // 奖惩名称
     @TableField("rewards_name")

+ 1 - 1
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserTitle.java

@@ -32,7 +32,7 @@ public class SysUserTitle extends BaseEntity {
 
     // 取得日期
     @TableField("get_date")
-    private Date getDate;
+    private String getDate;
 
     // 取得途径
     @TableField("get_access")

+ 3 - 3
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserTrain.java

@@ -36,15 +36,15 @@ public class SysUserTrain extends BaseEntity {
 
     // 培训起始日期
     @TableField("train_begin_date")
-    private Date trainBeginDate;
+    private String trainBeginDate;
 
     // 培训终止日期
     @TableField("train_end_date")
-    private Date trainEndDate;
+    private String trainEndDate;
 
     // 培训类型
     @TableField("train_level")
-    private Short trainLevel;
+    private String trainLevel;
 
     // 学时
     @TableField("time")

+ 2 - 2
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserWork.java

@@ -36,11 +36,11 @@ public class SysUserWork extends BaseEntity {
 
     // 起始日期
     @TableField("begin_date")
-    private Date beginDate;
+    private String beginDate;
 
     // 终止日期
     @TableField("end_date")
-    private Date endDate;
+    private String endDate;
 
     // 证明人
     @TableField("witness")

+ 9 - 9
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/service/dto/UserInfoDetailDto.java

@@ -19,10 +19,10 @@ public class UserInfoDetailDto extends BaseDTO {
     private String name;
 
     // 性别
-    private Short sex;
+    private String sex;
 
     // 民族
-    private Short nation;
+    private String nation;
 
     // 身份证号码
     private String idCard;
@@ -31,7 +31,7 @@ public class UserInfoDetailDto extends BaseDTO {
     private Integer age;
 
     // 出生日期
-    private Date birthday;
+    private String birthday;
 
     // 电子邮箱
     private String eMail;
@@ -43,19 +43,19 @@ public class UserInfoDetailDto extends BaseDTO {
     private String phone;
 
     // 员工状态
-    private Short userType;
+    private String userType;
 
     // 银行卡号
     private String bankNumber;
 
     // 婚姻状态
-    private Short maritalStatus;
+    private String maritalStatus;
 
     // 政治面貌
-    private Short politicalOutlook;
+    private String politicalOutlook;
 
     // 籍贯
-    private Byte nativePlace;
+    private String nativePlace;
 
     // 户口所在地
     private String registeredResidence;
@@ -79,7 +79,7 @@ public class UserInfoDetailDto extends BaseDTO {
     private String qq;
 
     // 入职时间
-    private Date entryDate;
+    private String entryDate;
 
     // 试用岗位
     private String probationPosition;
@@ -88,7 +88,7 @@ public class UserInfoDetailDto extends BaseDTO {
     private String probationTime;
 
     // 试用期结束日期
-    private Date probationEndDate;
+    private String probationEndDate;
 
     // 所属部门
     private String department;