From 4f442eff01e5b4e803f84e1a4454432b3ec8aebe Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 4 May 2023 15:26:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98addstaffv2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=96=87=E5=8C=96=E7=A8=8B?= =?UTF-8?q?=E5=BA=A6=E7=9A=84=E5=AD=97=E6=AE=B5=E3=80=81idCard=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=86=85=E9=83=A8?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=B8=AD=EF=BC=8C=E9=80=9A=E8=BF=87=E8=A7=A3?= =?UTF-8?q?=E6=9E=90idCard=E5=BE=97=E5=88=B0=E5=87=BA=E7=94=9F=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=AD=98=E5=82=A8=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=BC=96=E8=BE=91=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98editstaff=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=87=E5=8C=96=E7=A8=8B=E5=BA=A6=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E3=80=81idCard=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E5=86=85=E9=83=A8=E9=80=BB=E8=BE=91=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87=E8=A7=A3=E6=9E=90idCard=E5=BE=97?= =?UTF-8?q?=E5=88=B0=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AddStaffV2FromDTO.java | 7 +++++++ .../epmet/dto/form/StaffSubmitFromDTO.java | 13 +++++++++++++ .../com/epmet/entity/CustomerStaffEntity.java | 10 ++++++++++ .../impl/CustomerStaffServiceImpl.java | 19 +++++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java index 7bc3b93076..413e9af58a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java @@ -78,4 +78,11 @@ public class AddStaffV2FromDTO implements Serializable { * 烟台用：当前登录用户 */ private String currentUserId; + + /** + * 文化程度。0小学及文盲,1初中,2高中,3大专,4本科,5硕士,6博士,7中专 + */ + private String culture; + + private String idCard; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java index f39bde7aab..ded840ad19 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java @@ -8,6 +8,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -74,4 +75,16 @@ public class StaffSubmitFromDTO implements Serializable { * 社会自组织: community_org */ private String deptType; + + private String idCard; + + /** + * 文化程度。0小学及文盲,1初中,2高中,3大专,4本科,5硕士,6博士,7中专 + */ + private String culture; + + // /** + // * 出生日期 + // */ + // private Date birthday; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java index aa19464f9e..99ba05e16c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java @@ -111,4 +111,14 @@ public class CustomerStaffEntity extends BaseEpmetEntity { * 身份证号 */ private String idCard; + + /** + * 出生日期 + */ + private Date birthday; + + /** + * 文化程度。0小学及文盲,1初中,2高中,3大专,4本科,5硕士,6博士,7中专 + */ + private String culture; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 1ff4560c99..fcc7fdba67 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -37,6 +37,8 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.IdCardRegexUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerStaffConstant; import com.epmet.constant.RoleKeyConstants; @@ -73,6 +75,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.time.LocalDate; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; @@ -370,6 +373,14 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl