添加查询条件

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java

@@ -35,6 +35,11 @@ public class CaLoudongFormDTO  implements Serializable {
      */
     private String gridId;
 
+    /**
+     * 所处位置
+     */
+    private String buildingAddr;
+
     private Integer page;
     private Integer limit;
 

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java

@@ -29,6 +29,11 @@ public class CaPingfangFormDTO implements Serializable {
      */
     private String communityName;
 
+    /**
+     * 所处位置
+     */
+    private String buildingAddr;
+
     /**
      * 网格id
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java

@@ -39,6 +39,11 @@ public class CaRentalFormtDTO implements Serializable {
      */
     private String renterName;
 
+    /**
+     * 房屋地址
+     */
+    private String houseAddress;
+
     private Integer page;
 
     private Integer limit;

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java

@@ -44,4 +44,9 @@ public class CaResidentFormDTO implements Serializable {
      */
     private String gridId;
 
+    /**
+     * 现住详细地址
+     */
+    private String curliveAddressDetail;
+
 }

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java

@@ -40,6 +40,11 @@ public class CaRotatorsFormDTO implements Serializable {
      */
     private String gridId;
 
+    /**
+     * 现住详细地址
+     */
+    private String curliveAddressDetail;
+
     private Integer page;
     private Integer limit;
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java

@@ -35,7 +35,8 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
     List<CaLoudongResultDTO> getPage(@Param("communityName") String communityName,
                                      @Param("buildingName") String buildingName,
                                      @Param("gridId") String gridId,
-                                     @Param("gridList") List<String> gridList);
+                                     @Param("gridList") List<String> gridList,
+                                     @Param("buildingAddr") String buildingAddr);
 
     /**
      * 楼栋基本信息详情

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java

@@ -25,7 +25,8 @@ public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
     List<CaPingfangResultDTO> getPage(@Param("buildingName") String buildingName,
                                       @Param("communityName") String communityName,
                                       @Param("gridId") String gridId,
-                                      @Param("gridList") List<String> gridList);
+                                      @Param("gridList") List<String> gridList,
+                                      @Param("buildingAddr") String buildingAddr);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java

@@ -30,7 +30,8 @@ public interface CaRentalDao extends BaseDao<CaRentalEntity> {
                                     @Param("houseName") String houseName,
                                     @Param("renterName") String renterName,
                                     @Param("gridId") String gridId,
-                                    @Param("gridList") List<String> gridList);
+                                    @Param("gridList") List<String> gridList,
+                                    @Param("houseAddress") String houseAddress);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java

@@ -32,7 +32,8 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
                                       @Param("idCard") String idCard,
                                       @Param("telephone") String telephone,
                                       @Param("gridId") String gridId,
-                                      @Param("gridList") List<String> gridList);
+                                      @Param("gridList") List<String> gridList,
+                                      @Param("curliveAddressDetail") String curliveAddressDetail);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java

@@ -30,7 +30,8 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
                                       @Param("idCard") String idCard,
                                       @Param("telephone") String telephone,
                                       @Param("gridId") String gridId,
-                                      @Param("gridList") List<String> gridList);
+                                      @Param("gridList") List<String> gridList,
+                                      @Param("curliveAddressDetail") String curliveAddressDetail);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java

@@ -133,7 +133,8 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         List<CaLoudongResultDTO> result = baseDao.getPage(dto.getCommunityName(),
                 dto.getBuildingName(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getBuildingAddr());
         PageInfo<CaLoudongResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java

@@ -127,7 +127,8 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
         List<CaPingfangResultDTO> result = baseDao.getPage(dto.getBuildingName(),
                 dto.getCommunityName(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getBuildingAddr());
         PageInfo<CaPingfangResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java

@@ -131,7 +131,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
                 dto.getHouseName(),
                 dto.getRenterName(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getHouseAddress());
         PageInfo<CaRentalResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java

@@ -139,7 +139,8 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
                 dto.getIdCard(),
                 dto.getTelephone(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getCurliveAddressDetail());
         PageInfo<CaResidentResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java

@@ -135,7 +135,8 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
                 dto.getIdCard(),
                 dto.getTelephone(),
                 dto.getGridId(),
-                gridList);
+                gridList,
+                dto.getCurliveAddressDetail());
         PageInfo<CaRotatorsResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml

@@ -114,6 +114,9 @@
             <if test="gridId != null and gridId != ''">
                 AND vs.business_org_id = #{gridId}
             </if>
+            <if test="buildingAddr != null and buildingAddr != ''">
+                AND ca.building_addr like '%${buildingAddr}%'
+            </if>
         </where>
         order by ca.grid_id,ca.building_id,ca.community_id desc
     </select>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml

@@ -111,6 +111,9 @@
             <if test="gridId != null and gridId != ''">
                 AND vs.business_org_id = #{gridId}
             </if>
+            <if test="buildingAddr != null and buildingAddr != ''">
+                AND ca.building_addr like '%${buildingAddr}%'
+            </if>
         </where>
         order by ca.grid_id,ca.building_id,ca.community_id desc
     </select>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml

@@ -106,6 +106,9 @@
             <if test="gridId != null and gridId != ''">
                 AND vs.business_org_id = #{gridId}
             </if>
+            <if test="houseAddress != null and houseAddress != ''">
+                AND ca.house_address like '%${houseAddress}%'
+            </if>
         </where>
         order by ca.grid_id,ca.rental_id,ca.id_card desc
     </select>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml

@@ -138,6 +138,9 @@
                 <if test="gridId != null and gridId != ''">
                     AND vs.business_org_id = #{gridId}
                 </if>
+                <if test="curliveAddressDetail != null and curliveAddressDetail != ''">
+                    AND ca.curlive_address_detail like '%${curliveAddressDetail}%'
+                </if>
             </where>
             order by ca.grid_id,ca.resident_id,ca.id_card desc
     </select>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml

@@ -138,6 +138,9 @@
                 <if test="gridId != null and gridId != ''">
                     AND vs.business_org_id = #{gridId}
                 </if>
+                <if test="curliveAddressDetail != null and curliveAddressDetail != ''">
+                    AND curlive_address_detail like '%${curliveAddressDetail}%'
+                </if>
             </where>
             order by ca.grid_id,ca.rotators_id,ca.id_card desc
     </select>