From e895d2315c30d4cbed1d71fbbb3ec97756fc1e3f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 17 Jan 2022 14:51:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=201.=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E6=9F=A5=E8=AF=A2-=E6=90=9C=E7=B4=A2=E5=B1=85?= =?UTF-8?q?=E6=B0=91=20/icresiuser/search?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcUserDemandRecController.java | 4 ++- .../com/epmet/controller/HouseController.java | 1 + .../epmet/dto/form/IcResiUserPageFormDTO.java | 6 ++++ .../controller/IcResiUserController.java | 28 +++++++++++++++++++ .../java/com/epmet/dao/IcResiUserDao.java | 3 +- .../service/impl/IcResiUserServiceImpl.java | 5 ++-- .../main/resources/mapper/IcResiUserDao.xml | 7 +++++ 7 files changed, 49 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 019771d846..e3e9cde3b8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -66,7 +66,7 @@ import java.util.List; @RestController @RequestMapping("userdemand") public class IcUserDemandRecController implements ResultDataResolver { - + @Autowired private IcUserDemandRecService icUserDemandRecService; @Autowired @@ -346,6 +346,8 @@ public class IcUserDemandRecController implements ResultDataResolver { return new Result(); } + keyword = keyword.trim(); + LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO(); form.setApp(loginUser.getApp()); form.setClient(loginUser.getClient()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 44593788a9..f593287e77 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -103,6 +103,7 @@ public class HouseController implements ResultDataResolver { return new Result().ok(r); } + keyword = keyword.trim(); String neighborhoodName; String buildingName; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java index bf75ed325f..462353b404 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java @@ -37,5 +37,11 @@ public class IcResiUserPageFormDTO implements Serializable { @NotBlank(message = "当前用户id不能为空", groups = AddUserInternalGroup.class) private String staffId; + + /** + * 关键词 + */ + private String keyword; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 395a5d40b9..dd6cf7ef7e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -640,4 +640,32 @@ public class IcResiUserController { } return new Result<>(); } + + /** + * 【社区查询】搜索居民们 + * @param input + * @return + */ + @PostMapping("search") + public Result>> searchResi(@RequestBody IcResiUserPageFormDTO input, @LoginUser TokenDto loginUser) { + if (StringUtils.isBlank(input.getKeyword())) { + PageData> r = new PageData>(new ArrayList<>(), 0); + return new Result>>().ok(r); + } + + input.setKeyword(input.getKeyword().trim()); + input.setCustomerId(loginUser.getCustomerId()); + input.setStaffId(loginUser.getUserId()); + input.setFormCode("resi_base_info"); + if (input.getPageNo() == null) { + input.setPageNo(1); + } + + if (input.getPageSize() == null) { + input.setPageSize(20); + } + + PageData> r = icResiUserService.pageResiMap(input); + return new Result>>().ok(r); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index f1822e93f2..3a9cffbf7e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -59,7 +59,8 @@ public interface IcResiUserDao extends BaseDao { @Param("subTables") List subTables, @Param("currentStaffAgencyId")String currentStaffAgencyId, @Param("staffOrgPath") String staffOrgPath, - @Param("resultTableName")String resultTableName); + @Param("resultTableName")String resultTableName, + @Param("keyword") String keyword); /** * 查询主表 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 70f34f2849..cfa57f050e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -348,15 +348,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> list=baseDao.selectListResiMap(formDTO.getCustomerId(), formDTO.getFormCode(), formDTO.getConditions(), resultColumns, subTables,staffInfoCacheResult.getAgencyId(), - staffOrgPath,null); + staffOrgPath,null, formDTO.getKeyword()); pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size()); pageInfo.setList(list); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 6b07136f1c..9d07548103 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -51,6 +51,13 @@ AND ${resultTableName}.ID IS NOT NULL + + AND ( + NAME = #{keyword} + or MOBILE = #{keyword} + or ID_CARD = #{keyword} + ) + and ic_resi_user.customer_id=#{customerId} and (ic_resi_user.AGENCY_ID =#{currentStaffAgencyId} or ic_resi_user.pids like concat(#{staffOrgPath},'%'))