diff --git a/sql/upgrade/wfc_user_db/upgrade.sql b/sql/upgrade/wfc_user_db/upgrade.sql
index 8721424..ca5a0ef 100644
--- a/sql/upgrade/wfc_user_db/upgrade.sql
+++ b/sql/upgrade/wfc_user_db/upgrade.sql
@@ -1,5 +1,7 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
+ALTER TABLE `wfc_user_db`.`u_user`
+ ADD COLUMN `birth_date` date NULL COMMENT '出生日期' AFTER `age`
SET FOREIGN_KEY_CHECKS = 1;
diff --git a/sql/wfc_user_db/wfc_user_db.sql b/sql/wfc_user_db/wfc_user_db.sql
index edf1839..95718ef 100644
--- a/sql/wfc_user_db/wfc_user_db.sql
+++ b/sql/wfc_user_db/wfc_user_db.sql
@@ -765,6 +765,7 @@ CREATE TABLE `u_user` (
`avatar` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '头像地址',
`password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '密码',
`age` int(11) NULL DEFAULT NULL COMMENT '年龄',
+ `birth_date` date DEFAULT NULL COMMENT '出生日期',
`address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址',
`status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0正常 1停用）',
`del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
diff --git a/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UUser.java b/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UUser.java
index acdf263..22e7bcf 100644
--- a/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UUser.java
+++ b/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UUser.java
@@ -36,6 +36,10 @@ public class UUser extends BaseEntity
@Excel(name = "登录名称")
private String userName;
+ /** 出生日期 */
+ @Excel(name = "出生日期")
+ private Date birthDate;
+
/** 用户昵称 */
@Excel(name = "用户名称")
private String nickName;
@@ -332,6 +336,14 @@ public class UUser extends BaseEntity
return roleId;
}
+ public Date getBirthDate() {
+ return birthDate;
+ }
+
+ public void setBirthDate(Date birthDate) {
+ this.birthDate = birthDate;
+ }
+
public void setRoleId(Long roleId)
{
this.roleId = roleId;
@@ -368,6 +380,7 @@ public class UUser extends BaseEntity
.append("remark", getRemark())
.append("dept", getDept())
.append("kycStatus", getKycStatus())
+ .append("birthDate", getBirthDate())
.toString();
}
}
diff --git a/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java b/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java
index daded77..7899642 100644
--- a/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java
+++ b/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java
@@ -148,6 +148,7 @@ public class ULoginService {
user.setAddress(registerBody.getAddress());
user.setEmail(registerBody.getEmail());
user.setPhonenumber(registerBody.getPhonenumber());
+ user.setBirthDate(registerBody.getBirthDate());
R registerResult = remoteUserService.registerUserInfo(user, SecurityConstants.INNER);
if (R.FAIL == registerResult.getCode()) {
diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/form/RegisterBody.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/form/RegisterBody.java
index 6675a3e..1becaf0 100644
--- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/form/RegisterBody.java
+++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/form/RegisterBody.java
@@ -2,6 +2,8 @@ package org.wfc.common.core.web.form;
import lombok.Data;
+import java.util.Date;
+
/**
* 用户注册对象
*
@@ -30,6 +32,11 @@ public class RegisterBody extends LoginBody {
*/
private String address;
+ /**
+ * 出生日期
+ */
+ private Date birthDate;
+
/**
* 性别
*/
diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UUser.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UUser.java
index 126d139..b335d6b 100644
--- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UUser.java
+++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UUser.java
@@ -62,6 +62,9 @@ public class UUser {
@Schema(description = "年龄")
private Integer age;
+ @Schema(description = "出生日期")
+ private Date birthDate;
+
@Schema(description = "地址")
private String address;
diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UProfileController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UProfileController.java
index c7cedb0..bcc8a26 100644
--- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UProfileController.java
+++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UProfileController.java
@@ -88,6 +88,9 @@ public class UProfileController extends BaseController
if (user.getSex() != null) {
currentUser.setSex(user.getSex());
}
+ if (user.getBirthDate() != null) {
+ currentUser.setBirthDate(user.getBirthDate());
+ }
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
{
return error(MessageUtils.message("user.modify.user.phone.exist", loginUser.getUsername()));
diff --git a/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml
index e7c5625..6b0afeb 100644
--- a/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml
+++ b/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml
@@ -26,7 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
@@ -63,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select u.user_id, u.dept_id, u.user_name, u.nick_name, u.full_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.age, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ select u.user_id, u.dept_id, u.user_name, u.nick_name, u.full_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.age, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.birth_date,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
k.status as kyc_status
@@ -75,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"