From d999609a7b0d7e610d46e21a84db087ddb57c1d6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 31 Jan 2023 15:38:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E7=94=A8=E6=88=B7=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8+=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/PageRegUserFormDTO.java | 5 +++++ .../dto/result/ResiUserBaseInfoResultDTO.java | 18 ++++++++++++++++++ .../controller/UserBaseInfoController.java | 2 ++ .../java/com/epmet/dao/UserBaseInfoDao.java | 3 ++- .../service/impl/UserBaseInfoServiceImpl.java | 3 ++- .../main/resources/mapper/UserBaseInfoDao.xml | 15 ++++++++++++--- 6 files changed, 41 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageRegUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageRegUserFormDTO.java index 4d6cabafc6..fa4fb4878c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageRegUserFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageRegUserFormDTO.java @@ -17,5 +17,10 @@ public class PageRegUserFormDTO extends PageFormDTO implements Serializable { private String regStartTime; private String regEndTime; private String name; + + /** + * 查询详情时也调用此接口 + */ + private String userId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserBaseInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserBaseInfoResultDTO.java index 5fb44fd6af..59ffdc648c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserBaseInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserBaseInfoResultDTO.java @@ -1,7 +1,10 @@ package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 用户基础信息 返回值 @@ -73,4 +76,19 @@ public class ResiUserBaseInfoResultDTO implements Serializable { * 头像（目前来源于微信，后续系统顾客支持上传头像） */ private String headImgUrl; + + /** + * 注册时间 + * user_Base_info.CREATED_TIME + * register_relation.CREATED_TIME + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date regTime; + + /** + * 用户完善信息列表返回 + */ + private String gridId; + private String agencyId; + private String showIdNum; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java index a78c214b26..252195a076 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; @@ -241,6 +242,7 @@ public class UserBaseInfoController { * 来源于烟台需求，pc端新增菜单：用户完善信息列表 * @return */ + @MaskResponse(fieldNames = { "showIdNum"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("page-reguser") public Result> pageRegUser(@RequestBody PageRegUserFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java index 00edb5c70c..01d7fa11d7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java @@ -100,5 +100,6 @@ public interface UserBaseInfoDao extends BaseDao { @Param("gridId") String gridId, @Param("name") String name, @Param("regStartTime") String regStartTime, - @Param("regEndTime") String regEndTime); + @Param("regEndTime") String regEndTime, + @Param("userId") String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 651b706471..89da786c34 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -617,7 +617,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml index 2c023fa780..7cdcdc0913 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml @@ -83,7 +83,8 @@ DISTRICT district, BUILDING_ADDRESS buildingAddress, NICKNAME nickname, - HEAD_IMG_URL headImgUrl + HEAD_IMG_URL headImgUrl, + CREATED_TIME as regTime FROM user_base_info WHERE DEL_FLAG = '0' AND USER_ID = #{userId} @@ -181,7 +182,11 @@ ubi.DISTRICT district, ubi.BUILDING_ADDRESS buildingAddress, ubi.NICKNAME nickname, - ubi.HEAD_IMG_URL headImgUrl + ubi.HEAD_IMG_URL headImgUrl, + rr.CREATED_TIME as regTime, + rr.GRID_ID, + rr.AGENCY_ID, + ubi.ID_NUM as showIdNum FROM register_relation rr LEFT JOIN user_base_info ubi ON ( rr.USER_ID = ubi.USER_ID ) @@ -189,6 +194,9 @@ rr.DEL_FLAG = '0' AND rr.CUSTOMER_ID = #{customerId} AND rr.FIRST_REGISTER = '1' + + AND rr.USER_ID = #{userId} + AND rr.GRID_ID = #{gridId} @@ -196,7 +204,7 @@ AND rr.AGENCY_ID_PATH LIKE concat( '%', #{agencyId}, '%' ) - and rr.REAL_NAME like concat( '%', #{name}, '%' ) + and ubi.REAL_NAME like concat( '%', #{name}, '%' ) AND DATE_FORMAT( rr.CREATED_TIME, '%Y%m%d' ) >= #{regStartTime} @@ -204,5 +212,6 @@ AND DATE_FORMAT( rr.CREATED_TIME, '%Y%m%d' ) <= #{regEndTime} + order by rr.CREATED_TIME desc