新增：

1.社区查询-搜索房屋

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java

@@ -76,5 +76,10 @@ public class ListIcNeighborHoodFormDTO implements Serializable{
      */
     private String  neighborHoodId;
 
+    /**
+     * 搜索关键词，社区查询，搜索输入的关键词
+     */
+    private String keyword;
+
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -34,6 +34,7 @@ import com.epmet.excel.IcHouseExcel;
 import com.epmet.service.HouseService;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -64,11 +65,55 @@ public class HouseController {
     public Result houseList(@RequestBody ListIcNeighborHoodFormDTO formDTO){
         //效验数据
         ValidatorUtils.validateEntity(formDTO);
-        IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(formDTO);
+
+        String queryScene = "house_manage";
+
+        IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(formDTO.getBuildingId(), formDTO.getOwnerName(),
+                                                                                formDTO.getOwnerPhone(), null,
+                                                                    null, queryScene,
+                                                                                formDTO.getPageNo(), formDTO.getPageSize());
         return new Result().ok(icNeighborHoodResultDTO);
 
     }
 
+    /**
+      *@Description 社区查询-搜索房屋
+      *@Author  wangxianzhang
+      *@Date    2022/1/14 11:00 上午
+      *@Param
+      *@return
+      */
+    @PostMapping("search")
+    public Result<IcNeighborHoodResultDTO> searchHouse(@RequestBody ListIcNeighborHoodFormDTO formDTO) {
+        String keyword = formDTO.getKeyword();
+        if (StringUtils.isBlank(keyword)) {
+            IcNeighborHoodResultDTO r = new IcNeighborHoodResultDTO();
+            r.setTotal(0);
+            r.setList(new ArrayList<>());
+            return new Result<IcNeighborHoodResultDTO>().ok(r);
+        }
+
+        String neighborhoodName;
+        String buildingName;
+
+        int commaIndex = keyword.indexOf("，");
+        if (commaIndex != -1) {
+            neighborhoodName = keyword.substring(0, commaIndex);
+            buildingName = keyword.substring(commaIndex + 1);
+        } else {
+            neighborhoodName = keyword;
+            buildingName = null;
+        }
+
+        // 使用场景:社区查询
+        String scene = "community_search";
+
+        IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, null, null,
+                                neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize());
+
+        return new Result<IcNeighborHoodResultDTO>().ok(icNeighborHoodResultDTO);
+    }
+
     @NoRepeatSubmit
     @PostMapping("houseadd")
     public Result houseAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseFormDTO formDTO){

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -47,7 +47,12 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
 //                                                 @Param("building") IcBuildingEntity building,
 //                                                 @Param("house") IcHouseEntity house);
     IPage<Map<String, Object>> searchHouseByPage(IPage<IcHouseEntity> page,
-                                                 @Param("house") IcHouseEntity house);
+                                                 @Param("buildingId") String buildingId,
+                                                 @Param("ownerName") String ownerName,
+                                                 @Param("ownerPhone") String ownerPhone,
+                                                 @Param("neighborHoodName") String neighborHoodName,
+                                                 @Param("buildingName") String buildingName,
+                                                 @Param("queryScene") String queryScene);
 
     List<IcHouseExcel> searchAllHouse(@Param("house") IcHouseEntity house);
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -49,7 +49,14 @@ public interface HouseService {
 
     List<Integer> importExcel(String customerId, List<IcHouseExcel> list, String staffId, List<Integer> numList);
 
-    IcNeighborHoodResultDTO listNeighborhood(ListIcNeighborHoodFormDTO formDTO);
+    IcNeighborHoodResultDTO listNeighborhood(String buildingId,
+                                             String ownerName,
+                                             String ownerPhone,
+                                             String neighborHoodName,
+                                             String buildingName,
+                                             String queryScene,
+                                             Integer pageNo,
+                                             Integer pageSize);
 
     void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws  Exception;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -207,12 +207,29 @@ public class HouseServiceImpl implements HouseService {
     }
 
     @Override
-    public IcNeighborHoodResultDTO listNeighborhood(ListIcNeighborHoodFormDTO formDTO) {
+    public IcNeighborHoodResultDTO listNeighborhood(String buildingId,
+                                                    String ownerName,
+                                                    String ownerPhone,
+                                                    String neighborHoodName,
+                                                    String buildingName,
+                                                    String queryScene,
+                                                    Integer pageNo,
+                                                    Integer pageSize) {
         IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO();
         //如果类型是house 查房屋
-        IPage<Map<String, Object>> resultMap = searchHouse(formDTO);
+        //IPage<Map<String, Object>> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize);
-        result.setTotal(Long.valueOf(resultMap.getTotal()).intValue());
+
-        result.setList(resultMap.getRecords());
+        IPage<IcHouseEntity> page = new Page<IcHouseEntity>(pageNo,pageSize);
+
+        IPage<Map<String, Object>> mapIPage = icHouseDao.searchHouseByPage(page, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene);
+        List<Map<String, Object>> records = mapIPage.getRecords();
+        records.forEach(item->{
+            item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey")));
+            item.put("purpose", HousePurposeEnums.getTypeValue(item.get("purposeKey")));
+        });
+
+        result.setTotal(Long.valueOf(mapIPage.getTotal()).intValue());
+        result.setList(records);
         return result;
     }
 
@@ -247,20 +264,23 @@ public class HouseServiceImpl implements HouseService {
         return icHouseExcels;
     }
 
-    private IPage<Map<String, Object>> searchHouse(ListIcNeighborHoodFormDTO formDTO) {
+    /*private IPage<Map<String, Object>> searchHouse(String buildingId,
-        IPage<IcHouseEntity> page = new Page<IcHouseEntity>(formDTO.getPageNo(),formDTO.getPageSize());
+                                                    String ownerName,
-
+                                                    String ownerPhone,
-        IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
+                                                    String neighborHoodName,
-        house.setDelFlag("0");
+                                                   String buildingName,
+                                                   Integer pageNo,
+                                                   Integer pageSize) {
+        IPage<IcHouseEntity> page = new Page<IcHouseEntity>(pageNo,pageSize);
 
-        IPage<Map<String, Object>> mapIPage = icHouseDao.searchHouseByPage(page, house);
+        IPage<Map<String, Object>> mapIPage = icHouseDao.searchHouseByPage(page, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName);
         List<Map<String, Object>> records = mapIPage.getRecords();
         records.forEach(item->{
             item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey")));
             item.put("purpose", HousePurposeEnums.getTypeValue(item.get("purposeKey")));
         });
         return mapIPage;
-    }
+    }*/
 
     @Override
     public List<HouseInfoDTO> queryListHouseInfo(Set<String> houseIdList) {

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -130,21 +130,37 @@
         LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
         <where>
 
-            <if test="house.buildingId != null and house.buildingId.trim() != ''">
+            <if test="buildingId != null and buildingId.trim() != ''">
-                AND a.BUILDING_ID = #{house.buildingId}
+                AND a.BUILDING_ID = #{buildingId}
             </if>
-            <if test="house.ownerName != null and house.ownerName.trim() != ''">
+            <if test="ownerName != null and ownerName.trim() != ''">
-                AND a.OWNER_NAME like concat('%',#{house.ownerName},'%')
+                AND a.OWNER_NAME like concat('%',#{ownerName},'%')
             </if>
-            <if test="house.ownerPhone != null and house.ownerPhone.trim() != ''">
+            <if test="ownerPhone != null and ownerPhone.trim() != ''">
-                AND a.OWNER_PHONE like concat('%',#{house.ownerPhone},'%')
+                AND a.OWNER_PHONE like concat('%',#{ownerPhone},'%')
             </if>
-            <if test="house.delFlag != null and house.delFlag.trim() != ''">
+            <if test="neighborHoodName != null and neighborHoodName.trim() != ''">
-                AND a.DEL_FLAG = #{house.delFlag}
+                AND c.NEIGHBOR_HOOD_NAME like CONCAT('%',#{neighborHoodName},'%')
+            </if>
+            <if test="buildingName != null and buildingName.trim() != ''">
+                AND b.BUILDING_NAME like CONCAT('%',#{buildingName},'%')
             </if>
-
         </where>
-        ORDER BY  CAST(d.UNIT_NUM AS SIGNED), a.DOOR_NAME
+        /*排序规则：如果是社区查询则根据小区、楼栋、单元、房屋名字分别升序排序*/
+        <choose>
+            <when test="queryScene == 'community_search'">
+                ORDER BY CONVERT(c.NEIGHBOR_HOOD_NAME using gbk) ASC,
+                CONVERT(b.BUILDING_NAME USING gbk) ASC,
+                CONVERT(d.UNIT_NAME USING gbk) ASC,
+                CONVERT(a.HOUSE_NAME using gbk) ASC
+            </when>
+            <when test="queryScene == 'house_manage'">
+                ORDER BY CAST(d.UNIT_NUM AS SIGNED), a.DOOR_NAME
+            </when>
+            <otherwise>
+                ORDER BY CAST(d.UNIT_NUM AS SIGNED), a.DOOR_NAME
+            </otherwise>
+        </choose>
     </select>
     <select id="searchAllHouse" resultType="com.epmet.excel.IcHouseExcel">
         select