Merge remote-tracking branch 'origin/dev_optimize' into develop

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

@@ -17,7 +17,7 @@ public class SearchByNameFormDTO implements Serializable {
     private static final long serialVersionUID = -5017695783909884799L;
 
     public interface SearchByNameForm{}
-
+    public interface SearchByCategoryForm{}
     @NotBlank(message = "name不能为空",groups = SearchByNameForm.class)
     private String name;
 
@@ -27,4 +27,9 @@ public class SearchByNameFormDTO implements Serializable {
     @NotNull(message = "pageNo不能为空",groups = SearchByNameForm.class)
     private Integer pageNo;
 
+    @NotBlank(message = "columnName不能为空",groups = SearchByCategoryForm.class)
+    private String columnName;
+
+    private String customerId;
+    private String userId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SearchByNameResultDTO.java

@@ -55,6 +55,31 @@ public class SearchByNameResultDTO implements Serializable {
      */
     private String userId;
 
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
     public SearchByNameResultDTO() {
         this.sort = NumConstant.ZERO;
         this.name = "";
@@ -62,5 +87,10 @@ public class SearchByNameResultDTO implements Serializable {
         this.neighborHoodName = "";
         this.buildNum = "";
         this.userId = "";
+        this.mobile="";
+        this.gender="";
+        this.idCard="";
+        this.birthday="";
+        this.remarks="";
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -532,8 +532,24 @@ public class IcResiUserController implements ResultDataResolver {
      */
     @PostMapping("searchbyname")
     public Result<PageData<SearchByNameResultDTO>> searchByName(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO, SearchByNameFormDTO.SearchByNameForm.class);
-        return new Result<PageData<SearchByNameResultDTO>>().ok(icResiUserService.searchByName(formDTO, tokenDto));
+        return new Result<PageData<SearchByNameResultDTO>>().ok(icResiUserService.searchByName(formDTO));
+    }
+
+    /**
+     * 需求： http://zentao.elinkservice.cn/task-view-4193.html  第11条
+     * @param formDTO
+     * @param tokenDto
+     * @return 根据分类搜索
+     */
+    @PostMapping("search")
+    public Result<PageData<SearchByNameResultDTO>> search(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO, SearchByNameFormDTO.SearchByCategoryForm.class);
+        return new Result<PageData<SearchByNameResultDTO>>().ok(icResiUserService.searchByName(formDTO));
     }
 
     @NotNull

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

@@ -124,7 +124,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @author zxc
      * @date 2021/11/3 2:05 下午
      */
-    List<SearchByNameResultDTO> searchByName(@Param("name") String name, @Param("agencyId") String agencyId, @Param("pageNo") Integer pageNo);
+    List<SearchByNameResultDTO> searchByName(@Param("name") String name, @Param("columnName") String columnName, @Param("agencyId") String agencyId, @Param("pageNo") Integer pageNo);
 
     Set<String> selectUserDemandCode(String icResiUserId);
 

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

@@ -98,11 +98,10 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     /**
      * @Description  根据名字搜索
      * @param formDTO
-     * @param tokenDto
      * @author zxc
      * @date 2021/11/3 1:42 下午
      */
-    PageData<SearchByNameResultDTO> searchByName(SearchByNameFormDTO formDTO, TokenDto tokenDto);
+    PageData<SearchByNameResultDTO> searchByName(SearchByNameFormDTO formDTO);
 
 
     /**

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

@@ -835,19 +835,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     /**
      * @Description  根据名字搜索
      * @param formDTO
-     * @param tokenDto
      * @author zxc
      * @date 2021/11/3 1:42 下午
      */
     @Override
-    public PageData<SearchByNameResultDTO> searchByName(SearchByNameFormDTO formDTO, TokenDto tokenDto) {
+    public PageData<SearchByNameResultDTO> searchByName(SearchByNameFormDTO formDTO) {
         // 查询工作人员所属组织
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
         if (null == staffInfo){
             throw new RenException("未查询到当前工作人员所属组织");
         }
         Integer no = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
-        PageInfo<SearchByNameResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.searchByName(formDTO.getName(), staffInfo.getAgencyId(), no));
+        PageInfo<SearchByNameResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.searchByName(formDTO.getName(), formDTO.getColumnName(),staffInfo.getAgencyId(), no));
         List<SearchByNameResultDTO> result = pageInfo.getList();
         if (CollectionUtils.isEmpty(result)){
             return new PageData<>(new ArrayList<>(), pageInfo.getTotal());

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

@@ -200,7 +200,12 @@
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))
+        <if test="name != null and name != ''">
             AND `NAME` LIKE CONCAT('%',#{name},'%')
+        </if>
+        <if test="columnName != null and columnName != ''">
+            and ${columnName}='1'
+        </if>
         ORDER BY `NAME`
     </select>