烟台用户完善信息列表+详情

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;
 }
 

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;
 }

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<PageData<ResiUserBaseInfoResultDTO>>  pageRegUser(@RequestBody PageRegUserFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java

@@ -100,5 +100,6 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
                                                 @Param("gridId") String gridId,
                                                 @Param("name") String name,
                                                 @Param("regStartTime") String regStartTime,
-                                                @Param("regEndTime") String regEndTime);
+                                                @Param("regEndTime") String regEndTime,
+                                                @Param("userId") String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -617,7 +617,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 formDTO.getGridId(),
                 formDTO.getName(),
                 formDTO.getRegStartTime(),
-                formDTO.getRegEndTime());
+                formDTO.getRegEndTime(),
+                formDTO.getUserId());
         PageInfo<ResiUserBaseInfoResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }

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'
+         <if test="userId != null and userId.trim() != ''">
+            AND rr.USER_ID = #{userId}
+         </if>
           <if test="gridId != null and gridId.trim() != ''">
               AND rr.GRID_ID = #{gridId}
           </if>
@@ -196,7 +204,7 @@
               AND rr.AGENCY_ID_PATH LIKE concat( '%', #{agencyId}, '%' )
           </if>
           <if test="name != null and name.trim() != ''">
-              and rr.REAL_NAME like  concat( '%', #{name}, '%' )
+              and ubi.REAL_NAME like  concat( '%', #{name}, '%' )
           </if>
           <if test="regStartTime != null and regStartTime != ''">
             AND DATE_FORMAT( rr.CREATED_TIME, '%Y%m%d' ) &gt;= #{regStartTime}
@@ -204,5 +212,6 @@
           <if test="regEndTime != null and regEndTime != ''">
             AND DATE_FORMAT( rr.CREATED_TIME, '%Y%m%d' ) &lt;= #{regEndTime}
           </if>
+        order by rr.CREATED_TIME desc
     </select>
 </mapper>