1

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

@@ -205,6 +205,9 @@ public class RepairInfoService {
                 if("h5".equals(type) && "收款核账".equals(vo.getTitle())){
                     continue;
                 }
+                if("h5".equals(type) && "发件准备".equals(vo.getTitle())){
+                    continue;
+                }
                 repairLogListVo.add(vo);
             }
         }
@@ -264,6 +267,9 @@ public class RepairInfoService {
                 if(log.getOldRepairStatus() == 60 && log.getRepairStatus() == 50){  //维修中添加备件
                     status = 51;
                 }
+                if(log.getOldRepairStatus() == 60 && log.getRepairStatus() == 20){  //维修中添加备件
+                    status = 51;
+                }
                 if(log.getOldRepairStatus() == 30 && log.getRepairStatus() == 50){  //维修中添加备件
                     status = 41;
                 }