java110 vor 6 Jahren
Ursprung
Commit
c121572a9c

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

@@ -43,8 +43,6 @@ public class RepairDto extends PageDto implements Serializable {
     public static final String REPAIR_WAY_TRAINING = "300"; //抢单模式
 
 
-
-
     private String repairName;
     private String appointmentTime;
     private String repairType;
@@ -52,7 +50,7 @@ public class RepairDto extends PageDto implements Serializable {
     private String repairId;
     private String tel;
     private String state;
-    private String states;
+    private List<String> states;
     private String stateName;
     private String communityId;
     private String roomId;
@@ -281,11 +279,11 @@ public class RepairDto extends PageDto implements Serializable {
         this.photos = photos;
     }
 
-    public String getStates() {
+    public List<String> getStates() {
         return states;
     }
 
-    public void setStates(String states) {
+    public void setStates(List<String> states) {
         this.states = states;
     }
 }

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

@@ -435,8 +435,11 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
-        <if test="states !=null and states != ''">
-            and t.state in (#{states})
+        <if test="states !=null">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -491,8 +494,11 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
-        <if test="states !=null and states != ''">
-            and t.state in (#{states})
+        <if test="states !=null">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}

+ 6 - 0
service-api/src/main/java/com/java110/api/listener/ownerRepair/ListStaffFinishRepairsListener.java

@@ -18,6 +18,7 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -73,6 +74,11 @@ public class ListStaffFinishRepairsListener extends AbstractServiceApiListener {
         RepairDto ownerRepairDto = BeanConvertUtil.covertBean(reqJson, RepairDto.class);
         ownerRepairDto.setStaffId(reqJson.getString("userId"));
 
+        if(reqJson.containsKey("states")){
+            String[] states = reqJson.getString("states").split(",");
+            ownerRepairDto.setStates(Arrays.asList(states));
+        }
+
         int count = repairInnerServiceSMOImpl.queryStaffFinishRepairsCount(ownerRepairDto);