/epmetuser/userbaseinfo/page-reguser完善信息列表详情

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

@@ -0,0 +1,21 @@
+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;
+}
+

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.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 +31,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 +236,15 @@ public class UserBaseInfoController {
     public Result<DingLoginResiResDTO> dingResiLogin(@RequestBody DingLoginResiFormDTO formDTO){
         return new Result<DingLoginResiResDTO>().ok(userBaseInfoService.dingResiLogin(formDTO));
     }
+
+    /**
+     * 来源于烟台需求，pc端新增菜单：用户完善信息列表
+     * @return
+     */
+    @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,11 @@ 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);
 }

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/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,23 @@ 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());
+        PageInfo<ResiUserBaseInfoResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -167,4 +167,42 @@
           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
+        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="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 rr.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>
+    </select>
 </mapper>