进度条\(^o^)/~

src/main/java/com/fdkankan/sale/controller/RepairInfoController.java

@@ -64,12 +64,13 @@ public class RepairInfoController extends BaseController{
     }
 
     @GetMapping("/process")
-    public ResultData process(@RequestParam(required = false) String repairId){
+    public ResultData process(@RequestParam(required = false) String repairId,
+                              @RequestParam(required = false) String type){
         if(StringUtils.isBlank(repairId)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
 
-        return ResultData.ok(repairInfoService.getProcessByRepairId(repairId));
+        return ResultData.ok(repairInfoService.getProcessByRepairId(repairId,type));
     }
 
     @PostMapping("/list")

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

@@ -127,7 +127,7 @@ public class RepairInfoService {
      *      *      * status 0待接单，10待检测，20待报价，30待确认，40已取消，50待备料，60维修中，70待测试，
      *      *      *        80待支付（已完结），90待回收，100待发货，110已发货
      */
-    public Object getProcessByRepairId(String repairId) {
+    public Object getProcessByRepairId(String repairId,String type) {
         List<RepairLogVo> repairLogList = repairLogService.getVoByRepairId(repairId);
         for (RepairLogVo repairLogVo : repairLogList) {
             switch (repairLogVo.getRepairStatus()){
@@ -172,12 +172,15 @@ public class RepairInfoService {
             }
             setTitle(repairLogVo,1);
         }
+        List<Integer> delStatus = Arrays.asList(41,90,91);
         List<RepairLogVo> repairLogListVo = new ArrayList<>();
         if(repairLogList.size() >0){
             RepairLogVo repairLogVo = repairLogList.get(0);
             RepairLogVo logVo = getNextStepVo(repairLogVo);
             if(logVo!= null){
-                repairLogListVo.add(logVo);
+                if(! ("h5".equals(type) && delStatus.contains(logVo.getRepairStatus()) )){
+                    repairLogListVo.add(logVo);
+                }
             }
             repairLogListVo.addAll(repairLogList);
         }