优化退单结单时的退单

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

@@ -35,6 +35,7 @@ public class RepairUserDto extends PageDto implements Serializable {
     private String[] repairIds;
     private String ruId;
     private String state;
+    private String[] states;
     private String stateName;
     private String communityId;
     private String userId;
@@ -206,4 +207,12 @@ public class RepairUserDto extends PageDto implements Serializable {
     public void setDuration(String duration) {
         this.duration = duration;
     }
+
+    public String[] getStates() {
+        return states;
+    }
+
+    public void setStates(String[] states) {
+        this.states = states;
+    }
 }

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

@@ -118,6 +118,13 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+
+        <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}
         </if>
@@ -203,6 +210,12 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <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}
         </if>

service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairDispatchListener.java

@@ -173,12 +173,12 @@ public class RepairDispatchListener extends AbstractServiceApiPlusListener {
         repairUserPo.setRepairId(reqJson.getString("repairId"));
         repairUserPo.setStaffId(reqJson.getString("staffId"));
         repairUserPo.setStaffName(reqJson.getString("staffName"));
+        repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         repairUserDto = new RepairUserDto();
         repairUserDto.setRepairId(reqJson.getString("repairId"));
         repairUserDto.setStaffId(reqJson.getString("staffId"));
         repairUserDto.setCommunityId(reqJson.getString("communityId"));
-        repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-        repairUserDto.setState(RepairUserDto.STATE_TRANSFER);
+        repairUserDto.setStates(new String[]{RepairUserDto.STATE_TRANSFER, RepairUserDto.STATE_CLOSE});
         repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
 
         if (repairUserDtos == null || repairUserDtos.size() < 1) {
@@ -186,7 +186,7 @@ public class RepairDispatchListener extends AbstractServiceApiPlusListener {
                     || RepairDto.REPAIR_WAY_TRAINING.equals(repairDtos.get(0).getRepairWay())
             ) {
                 ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_WAIT);
-                return ;
+                return;
             } else {
                 throw new IllegalArgumentException("未找到上级处理人");
             }