24、小区管理新增房屋时，出租更改为房屋状态：出租、闲置、自住；历史数据中是--出租，否--自住，默认选中自住；房屋查询增加房屋状态的查询，显示对应房屋列表

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

@@ -79,9 +79,9 @@ public class IcHouseFormDTO implements Serializable {
     private String purpose;
 
     /**
-     * 1出租；0未出租
+     * 1：出租 0：自住  2：闲置
      */
-    @NotNull(message = "是否出租不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
+    @NotNull(message = "房屋状态不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer rentFlag;
 
     /**

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

@@ -62,6 +62,10 @@ public class ListIcNeighborHoodFormDTO implements Serializable{
      * 房主电话
      */
     private String  ownerPhone;
+    /**
+     * 房屋状态 【1：出租 0：自住  2：闲置】
+     */
+    private String  rentFlag;
     /**
      * 数据类型【小区：neighbourHood，楼栋：building，房屋：house】
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java

@@ -3,8 +3,12 @@ package com.epmet.enums;
 import org.springframework.util.StringUtils;
 
 public enum HouseRentFlagEnums {
-    YES(1,"是"),
-    NO(0,"否");
+    //原有的房屋出租状态是否改为房屋状态【1：出租 0：自住  2：闲置】
+    /*YES(1,"是"),
+    NO(0,"否");*/
+    HOUSE_ZZ(0,"自住"),
+    HOUSE_CZ(1,"出租"),
+    HOUSE_XZ(2,"闲置");
 
 
 

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

@@ -92,9 +92,8 @@ public class HouseController implements ResultDataResolver {
         String queryScene = "house_manage";
 
         IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(),
-                                                                                formDTO.getOwnerPhone(), null,
-                                                                    null, queryScene,
-                                                                                formDTO.getPageNo(), formDTO.getPageSize());
+                formDTO.getOwnerPhone(), null, null, queryScene,
+                formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getRentFlag());
         return new Result().ok(icNeighborHoodResultDTO);
 
     }
@@ -142,7 +141,7 @@ public class HouseController implements ResultDataResolver {
                 null);
 
         IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(loginUserDetail.getAgencyId(),null, null, null,
-                                neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize());
+                                neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(), null);
 
         return new Result<IcNeighborHoodResultDTO>().ok(icNeighborHoodResultDTO);
     }

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

@@ -38,7 +38,8 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
                                                  @Param("ownerPhone") String ownerPhone,
                                                  @Param("neighborHoodName") String neighborHoodName,
                                                  @Param("buildingName") String buildingName,
-                                                 @Param("queryScene") String queryScene);
+                                                 @Param("queryScene") String queryScene,
+                                                 @Param("rentFlag") String rentFlag);
 
     List<IcHouseExcel> searchAllHouse(@Param("house") IcHouseEntity house);
 

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

@@ -62,7 +62,8 @@ public interface HouseService {
                                              String buildingName,
                                              String queryScene,
                                              Integer pageNo,
-                                             Integer pageSize);
+                                             Integer pageSize,
+                                             String rentFlag);
 
     void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws  Exception;
 

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

@@ -256,7 +256,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                                                     String buildingName,
                                                     String queryScene,
                                                     Integer pageNo,
-                                                    Integer pageSize) {
+                                                    Integer pageSize,
+                                                    String rentFlag) {
         IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO();
         //如果类型是house 查房屋
         //IPage<Map<String, Object>> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize);
@@ -280,7 +281,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
         IPage<IcHouseEntity> page = new Page<IcHouseEntity>(pageNo,pageSize);
 
-        IPage<Map<String, Object>> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene);
+        IPage<Map<String, Object>> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene, rentFlag);
         List<Map<String, Object>> records = mapIPage.getRecords();
         records.forEach(item->{
             item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey")));

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

@@ -154,7 +154,7 @@
         b.BUILDING_NAME as buildingName,
         d.UNIT_NUM as unitNum,
         a.DOOR_NAME as doorName,
-        if(a.RENT_FLAG=1,'是','否') as rentFlag,
+        if(a.RENT_FLAG=0,'自住',if(a.RENT_FLAG=1,'出租','闲置')) as rentFlag,
         a.OWNER_NAME as ownerName,
         /*a.RENT_FLAG as rentFlag,
         a.PURPOSE as purpose,*/
@@ -197,6 +197,9 @@
             <if test="buildingName != null and buildingName.trim() != ''">
                 AND b.BUILDING_NAME like CONCAT('%',#{buildingName},'%')
             </if>
+            <if test="rentFlag != null and rentFlag.trim() != ''">
+                AND a.rent_flag = #{rentFlag}
+            </if>
         </where>
         /*排序规则：如果是社区查询则根据小区、楼栋、单元、房屋名字分别升序排序*/
         <choose>
@@ -220,7 +223,7 @@
         a.DOOR_NAME as doorName,
         a.HOUSE_TYPE as houseType,
         a.PURPOSE as purpose,
-        if(a.RENT_FLAG=1,'是','否') as rentFlag,
+        if(a.RENT_FLAG=0,'自住',if(a.RENT_FLAG=1,'出租','闲置')) as rentFlag,
         a.OWNER_NAME as ownerName,
         a.OWNER_PHONE as ownerPhone,
         a.OWNER_ID_CARD as ownerIdCard,