1

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

@@ -177,11 +177,18 @@ public class RepairInfoService {
         List<RepairLogVo> repairLogListVo = new ArrayList<>();
         if(repairLogList.size() >0){
             RepairLogVo repairLogVo = repairLogList.get(0);
+
             RepairLogVo logVo = getNextStepVo(repairLogVo);
             if(logVo!= null){
-                if(! ("h5".equals(type) && delStatus.contains(logVo.getRepairStatus()) )){
-                    repairLogListVo.add(logVo);
+                if("h5".equals(type) && delStatus.contains(logVo.getRepairStatus())){
+                    switch (repairLogVo.getRepairStatus()){
+                        case 41 : repairLogVo.setRepairStatus(50);break;
+                        case 90 : repairLogVo.setRepairStatus(100);break;
+                        case 91 : repairLogVo.setRepairStatus(100);break;
+                    }
+                    logVo = getNextStepVo(repairLogVo);
                 }
+                repairLogListVo.add(logVo);
             }
             for (RepairLogVo vo : repairLogList) {
                 if("h5".equals(type) && delStatusIng.contains(vo.getRepairStatus())){