1

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

@@ -25,10 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class RepairInfoService {
@@ -179,9 +176,9 @@ public class RepairInfoService {
         List<Integer> delStatus = Arrays.asList(41,82,90,91);
         List<Integer> delStatusIng = Arrays.asList(50,82,90,91,100);
         List<RepairLogVo> repairLogListVo = new ArrayList<>();
+        repairLogList.removeIf(Objects::isNull);
         if(repairLogList.size() >0){
             RepairLogVo repairLogVo = repairLogList.get(0);
-
             RepairLogVo logVo = getNextStepVo(repairLogVo);
             if(logVo!= null){
                 if("h5".equals(type) && delStatus.contains(logVo.getRepairStatus())){
@@ -267,6 +264,9 @@ public class RepairInfoService {
                 if(log.getOldRepairStatus() == 30 && log.getRepairStatus() == 91){  //维修中添加备件
                     status = 40;
                 }
+                if(log.getOldRepairStatus() == 20 && log.getRepairStatus() == 60){  //维修中添加备件
+                    return null;
+                }
                 if(log.getRepairStatus() == 82 ){
                     status = 90;
                 }