Merge remote-tracking branch 'origin/房屋tree_yzm' into dev

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java

@@ -28,7 +28,6 @@ public class AdviceListFormDTO {
     /**
      * 组织id 不填查询所有
      */
-    @NotBlank(message = "agencyId不能为空",groups = WorkPcGroup.class)
     private String agencyId;
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageRegUserFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 来源于烟台需求，pc端新增菜单：用户完善信息列表
+ * @Author yzm
+ * @Date 2023/1/31 14:37
+ */
+@Data
+public class PageRegUserFormDTO extends PageFormDTO implements Serializable {
+    private String agencyId;
+    private String gridId;
+    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,8 @@
 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;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -30,10 +32,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.UserBaseInfoDTO;
-import com.epmet.dto.form.CommonUserIdFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.DingLoginResiFormDTO;
-import com.epmet.dto.form.IssueInitiatorFormDTO;
-import com.epmet.dto.form.VolunteerRegResiFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.excel.UserBaseInfoExcel;
@@ -238,5 +237,16 @@ public class UserBaseInfoController {
     public Result<DingLoginResiResDTO> dingResiLogin(@RequestBody DingLoginResiFormDTO formDTO){
         return new Result<DingLoginResiResDTO>().ok(userBaseInfoService.dingResiLogin(formDTO));
     }
+
+    /**
+     * 来源于烟台需求，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);
+        return new Result<PageData<ResiUserBaseInfoResultDTO>>().ok(userBaseInfoService.pageRegUser(formDTO));
+    }
 }
 

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

@@ -94,4 +94,12 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
     String selectIdCard(String userId);
 
     UserBaseInfoEntity selectUserByMobile(@Param("customerId") String customerId, @Param("mobile")String mobile);
+
+    List<ResiUserBaseInfoResultDTO> pageRegUser(@Param("customerId") String customerId,
+                                                @Param("agencyId") String agencyId,
+                                                @Param("gridId") String gridId,
+                                                @Param("name") String name,
+                                                @Param("regStartTime") String regStartTime,
+                                                @Param("regEndTime") String regEndTime,
+                                                @Param("userId") String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java

@@ -25,6 +25,7 @@ import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.form.CommonUserIdFormDTO;
 import com.epmet.dto.form.DingLoginResiFormDTO;
+import com.epmet.dto.form.PageRegUserFormDTO;
 import com.epmet.dto.form.VolunteerRegResiFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.UserBaseInfoEntity;
@@ -220,4 +221,11 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
      * @Date 2022/9/15 11:17
      */
     DingLoginResiResDTO dingResiLogin(DingLoginResiFormDTO formDTO);
+
+    /**
+     * 用户完善信息列表
+     * @param formDTO
+     * @return
+     */
+    PageData<ResiUserBaseInfoResultDTO> pageRegUser(PageRegUserFormDTO formDTO);
 }

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

@@ -278,9 +278,12 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         List<String> userIds = new ArrayList<>();
         userIds.add(certificationAddFormDTO.getUserId());
         List<UserBaseInfoResultDTO> userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(userIds);
-        if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)) {
+        if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)||null==userBaseInfoResultDTOS.get(NumConstant.ZERO)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),String.format("查询用户基本信息集合为空,userId:%s",certificationAddFormDTO.getUserId()),"查询用户基本信息异常");
         }
+        if(StringUtils.isBlank(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRegisteredGridId())){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"异常信息：注册网格为空","服务器开小差了...注册网格为空");
+        }
         userBadgeDao.updateCertificateRecordIsLast(form.getBadgeId(),form.getUserId());
         form.setGridId(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRegisteredGridId());
         form.setIdNum(certificationAddFormDTO.getIdcard());

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

@@ -34,6 +34,7 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.NameUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.*;
@@ -41,10 +42,7 @@ import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserWechatDTO;
-import com.epmet.dto.form.CommonUserIdFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.DingLoginResiFormDTO;
-import com.epmet.dto.form.UserRoleFormDTO;
-import com.epmet.dto.form.VolunteerRegResiFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.entity.UserBaseInfoEntity;
@@ -58,6 +56,8 @@ import com.epmet.service.RegisterRelationService;
 import com.epmet.service.UserBaseInfoService;
 import com.epmet.service.UserResiInfoService;
 import com.epmet.util.ModuleConstant;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -602,4 +602,24 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         }
         return result;
     }
+
+    /**
+     * 用户完善信息列表
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<ResiUserBaseInfoResultDTO> pageRegUser(PageRegUserFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+        List<ResiUserBaseInfoResultDTO> list = baseDao.pageRegUser(EpmetRequestHolder.getLoginUserCustomerId(),
+                formDTO.getAgencyId(),
+                formDTO.getGridId(),
+                formDTO.getName(),
+                formDTO.getRegStartTime(),
+                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}
@@ -167,4 +168,50 @@
           AND ubi.DEL_FLAG = '0'
          order by ubi.CREATED_TIME desc limit 1
     </select>
+
+    <select id="pageRegUser" parameterType="map" resultType="com.epmet.dto.result.ResiUserBaseInfoResultDTO">
+        SELECT
+            ubi.USER_ID userId,
+            ubi.SURNAME surname,
+            ubi.`NAME` `name`,
+            ubi.REAL_NAME realName,
+            ubi.ID_NUM idNum,
+            ubi.GENDER gender,
+            IFNULL( ubi.MOBILE, '' ) mobile,
+            ubi.STREET street,
+            ubi.DISTRICT district,
+            ubi.BUILDING_ADDRESS buildingAddress,
+            ubi.NICKNAME nickname,
+            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 )
+        WHERE
+            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>
+          <if test="agencyId != null and agencyId.trim() != ''">
+              AND rr.AGENCY_ID_PATH LIKE concat( '%', #{agencyId}, '%' )
+          </if>
+          <if test="name != null and name.trim() != ''">
+              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}
+          </if>
+          <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>