优化 我的报修查询功能

Api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java

@@ -9,6 +9,7 @@ import com.java110.dto.repair.RepairDto;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeOwnerRepairConstant;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.api.ownerRepair.ApiOwnerRepairDataVo;
 import com.java110.vo.api.ownerRepair.ApiOwnerRepairVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +65,12 @@ public class ListOwnerRepairsListener extends AbstractServiceApiListener {
 
         RepairDto ownerRepairDto = BeanConvertUtil.covertBean(reqJson, RepairDto.class);
 
+        if(!StringUtil.isEmpty(ownerRepairDto.getRoomId()) && ownerRepairDto.getRoomId().contains(",")){
+            String[] roomIds = ownerRepairDto.getRoomId().split(",");
+            ownerRepairDto.setRoomIds(roomIds);
+            ownerRepairDto.setRoomId("");
+        }
+
         int count = repairInnerServiceSMOImpl.queryRepairsCount(ownerRepairDto);
 
         List<ApiOwnerRepairDataVo> ownerRepairs = null;

java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java

@@ -25,6 +25,7 @@ public class RepairDto extends PageDto implements Serializable {
     private String stateName;
     private String communityId;
     private String roomId;
+    private String[] roomIds;
     private String repairTypeName;
 
     private String staffId;
@@ -175,4 +176,12 @@ public class RepairDto extends PageDto implements Serializable {
     public void setRepairDispatchStateName(String repairDispatchStateName) {
         this.repairDispatchStateName = repairDispatchStateName;
     }
+
+    public String[] getRoomIds() {
+        return roomIds;
+    }
+
+    public void setRoomIds(String[] roomIds) {
+        this.roomIds = roomIds;
+    }
 }

java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml

@@ -172,6 +172,13 @@
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
+        <if test="roomIds !=null ">
+            and t.room_id in
+            <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -269,6 +276,12 @@
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
         </if>
+        <if test="roomIds !=null ">
+            and t.room_id in
+            <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
 
     </select>