1

src/main/java/com/fdkankan/sale/service/impl/RepairServiceImpl.java

@@ -147,6 +147,10 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
                 param.setRepairIds(repairIds);
             }
         }
+        param.setStatusList(Arrays.asList(param.getStatus()));
+        if(param.getStatus().equals(RepairStatusEnum.TO_BE_RECOVERED.status())){
+            param.getStatusList().add(RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status());
+        }
         Page<RepairerVo> page = getBaseMapper().pageInfoList(new Page<>(param.getPageNum(), param.getPageSize()), param);
         sysUserService.setSaleNameAndRepairManName(page.getRecords());
         return page;

src/main/java/com/fdkankan/sale/vo/request/RepairInfoListParam.java

@@ -3,6 +3,7 @@ package com.fdkankan.sale.vo.request;
 import com.fdkankan.sale.common.RequestBase;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -23,4 +24,8 @@ public class RepairInfoListParam extends RequestBase {
     private Integer commentStatus;
     private Set<String> repairIds;
     private String repairId;
+
+    private List<Integer> statusList = new ArrayList<>();
+
+
 }

src/main/resources/mapper/sale/RepairMapper.xml

@@ -191,11 +191,11 @@
         <if test="param.repairId != null and param.repairId != ''">
             and r.repair_id like  concat ('%',#{param.repairId},'%')
         </if>
-        <if test="param.status != null">
-            and r.status = #{param.status}
-        </if>
-        <if test="param.status != null and param.status ==90">
-            and r.status in (90,91)
+        <if test="param.statusList != null and param.statusList.length >0">
+            and r.status in
+            <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
+                #{status}
+            </foreach>
         </if>
         <if test="param.cameraType != null">
             and r.camera_type = #{param.cameraType}