java110 5 gadi atpakaļ
vecāks
revīzija
48e2cb5680

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/rentingPool/RentingPoolDto.java

@@ -35,6 +35,7 @@ public class RentingPoolDto extends PageDto implements Serializable {
     private String ownerName;
     private String price;
     private String state;
+    private String[] states;
     private String communityId;
     private String longitude;
 
@@ -172,4 +173,12 @@ public class RentingPoolDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getStates() {
+        return states;
+    }
+
+    public void setStates(String[] states) {
+        this.states = states;
+    }
 }

+ 7 - 0
java110-db/src/main/resources/mapper/user/RentingPoolServiceDaoImplMapper.xml

@@ -64,6 +64,13 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="states !=null ">
+            and t.states in
+            <foreach collection="states" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>

+ 9 - 2
service-user/src/main/java/com/java110/user/api/RentingApi.java

@@ -233,13 +233,20 @@ public class RentingApi {
      * @path /app/renting/queryRentingPool
      */
     @RequestMapping(value = "/queryRentingPool", method = RequestMethod.GET)
-    public ResponseEntity<String> queryRentingPool(@RequestParam(value = "communityId") String communityId,
+    public ResponseEntity<String> queryRentingPool(@RequestParam(value = "communityId", required = false) String communityId,
                                                    @RequestParam(value = "page") int page,
-                                                   @RequestParam(value = "row") int row) {
+                                                   @RequestParam(value = "row") int row,
+                                                   @RequestParam(value = "state", required = false) String state
+    ) {
         RentingPoolDto rentingPoolDto = new RentingPoolDto();
         rentingPoolDto.setPage(page);
         rentingPoolDto.setRow(row);
         rentingPoolDto.setCommunityId(communityId);
+        if (state.contains(",")) {
+            rentingPoolDto.setStates(state.split(","));
+        } else {
+            rentingPoolDto.setState(state);
+        }
         return getRentingPoolBMOImpl.get(rentingPoolDto);
     }