后台修改6

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -368,9 +368,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String status = baseProcess.getAllLocationStatus();
                     String[] split1 = status.split(",");
                     split1[0] = "2";
-                    split1[1] = "2";
-                    split1[2] = "2";
-                    split1[3] = "3";
+                    split1[1] = "3";
+                    split1[2] = "0";
+                    split1[3] = "0";
                     baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
                 }
                 if (baseLocation.getId() == 3 || baseLocation.getId() == 4) {
@@ -379,8 +379,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     split1[0] = "2";
                     split1[1] = "2";
                     split1[2] = "2";
-                    split1[3] = "3";
-                    split1[4] = "0";
+                    split1[3] = "2";
+                    split1[4] = "3";
                     baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
                 }
 
@@ -647,10 +647,10 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         if (StringUtils.isBlank(date)) {
             date = sdf.format(new Date());
         }
-        BillClean billClean1 = cleanMapper.selectById(id);//某条洗消记录
+     /*   BillClean billClean1 = cleanMapper.selectById(id);//某条洗消记录
         if (billClean1.getBillStatus() != 0) {
             return new Result(10001, "该订单已通过，无需再次提交！", false);
-        }
+        }*/
         String s1 = "";
         String s2 = "";
         String s3 = "";
@@ -790,7 +790,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billPcr.setTestLocation(baseLocation.getLocationName());
                         billPcr.setTestLocationId(baseLocation.getId());
                         dryMapper.insert(billPcr);
-                        baseProcess.setAllLocationStatus("2,2,2,1");
+                        baseProcess.setAllLocationStatus("2,2,1,0");
                     }
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                     baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
@@ -819,44 +819,37 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "2");
 
+                    String status1 = baseProcess.getAllLocationStatus();
+                    String[] split = status1.split(",");
+                    if (billClean.getTestLocationId() == 6) {
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                    }
+                    if (billClean.getTestLocationId() == 7) {
+                        split[0] = "2";
+                        split[1] = "2";
+                        split[2] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + status1.substring(5));
+                    }
+                    if (billClean.getTestLocationId() == 9) {
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                    }
+                    if (billClean.getTestLocationId() == 10) {
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                    }
+                    if (billClean.getTestLocationId() == 11) {
+                        baseProcess.setAllLocationStatus("2,3");
+                    }
+
                     processMapper.updateById(baseProcess);
                 }
                 return new Result(10000, "修改成功！", true);
-            } else if (billClean.getDestId() == 53) {
-                if ("1".equals(result)) {
-                    billClean.setBillStatus(1);
-                    baseProcess.setProcessType(1);
-                } else {
-                    billClean.setBillStatus(2);
-                    baseProcess.setProcessType(2);
-                }
-                Integer processId = billClean.getProcessId();
-                QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
-                BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
-                admission.setBillStatus(1);
-                admission.setPassDate(LocalDateTime.now());
-                admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
-                admissionMapper.updateById(admission);
-                billClean.setImgStatus(1);
-                billClean.setImgUrl(s);
-                billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
-                billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                billClean.setTestLocation(baseLocation.getLocationName());
-                billClean.setTestLocationId(baseLocation.getId());
-                billClean.setCheckDate(sdf.parse(date));
-                billClean.setPassDate(sdf.parse(sdf.format(new Date())));
-                baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
-                baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
-                String status = baseProcess.getCurrentStatus();
-                String substring = status.substring(0, status.length() - 1);
-                baseProcess.setCurrentStatus(substring + "1");
-                processMapper.updateById(baseProcess);
-                cleanMapper.updateById(billClean);
-                return new Result(10000, "修改成功！", true);
-            } else {
+            }  else {
                 //当前是目的地
                 if ("1".equals(result)) {
                     billClean.setBillStatus(1);
@@ -874,6 +867,33 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 billClean.setCheckDate(sdf.parse(date));
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
 
+                String status1 = baseProcess.getAllLocationStatus();
+                String[] split = status1.split(",");
+                if (billClean.getTestLocationId() == 6) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                }
+                if (billClean.getTestLocationId() == 7) {
+                    split[0] = "2";
+                    split[1] = "2";
+                    split[2] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + status1.substring(5));
+                }
+                if (billClean.getTestLocationId() == 9) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                }
+                if (billClean.getTestLocationId() == 10) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                }
+                if (billClean.getTestLocationId() == 11) {
+                    baseProcess.setAllLocationStatus("2,3");
+                }
+
                 baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
@@ -941,7 +961,16 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "2");
 
-                    baseProcess.setAllLocationStatus("2,2,2,3");
+//                    baseProcess.setAllLocationStatus("2,2,2,3");
+
+                    String status1 = baseProcess.getAllLocationStatus();
+                    String[] split = status1.split(",");
+                    if (billClean.getTestLocationId() == 7) {
+                        split[0] = "2";
+                        split[1] = "2";
+                        split[2] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + status1.substring(5));
+                    }
 
                     processMapper.updateById(baseProcess);
                 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPcrServiceImpl.java

@@ -351,21 +351,18 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
 
                     baseProcess.setCurrentStatus(substring + "1," + 0);
 
+                    if (billPcr.getDestId() == 11) {
+                        baseProcess.setAllLocationStatus("2,1");
+                    }
+                    if (billPcr.getDestId() == 10) {
+                        baseProcess.setAllLocationStatus("2,1");
+                    }
+                    if (billPcr.getDestId() == 9) {
+                        baseProcess.setAllLocationStatus("2,1");
+                    }
+
                     processMapper.updateById(baseProcess);
                     pcrMapper.updateById(billPcr);
-                    ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10);
-                    Runnable task = new Runnable() {
-                        @Override
-                        public void run() {
-                            //这里写业务
-                            billPcr.setBillStatus(3);
-                            pcrMapper.updateById(billPcr);
-                        }
-                    };
-                    // 设定延迟时间（两小时后执行，单位为秒）
-                    long delay = 60 * 60 * 2;
-                    // 执行定时任务
-                    scheduler.schedule(task, delay, TimeUnit.SECONDS);
                     return new Result(10000, "修改成功！", true);
                 } else {
 
@@ -412,12 +409,63 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         baseProcess.setProcessType(2);
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "2";
+                        split[2] = "2";
+                        split[3] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3] + status1.substring(7));
                     }
                     if (baseLocation.getId() == 4) {
                         //第三次不合格
                         baseProcess.setProcessType(2);
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "2";
+                        split[2] = "2";
+                        split[3] = "2";
+                        split[4] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3] + "," + split[4] + status1.substring(9));
+                    }
+
+                    if (baseLocation.getId() == 17) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                    }
+                    if (baseLocation.getId() == 15) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                    }
+                    if (baseLocation.getId() == 9) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                    }
+                    if (baseLocation.getId() == 10) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                    }
+                    if (baseLocation.getId() == 11) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
                     }
 
                     processMapper.updateById(baseProcess);
@@ -443,6 +491,18 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "1");
                     baseProcess.setProcessType(1);
+
+                    if (baseLocation.getId() == 9) {
+                        baseProcess.setAllLocationStatus("2,2");
+                    }
+                    if (baseLocation.getId() == 10) {
+
+                        baseProcess.setAllLocationStatus("2,2");
+                    }
+                    if (baseLocation.getId() == 11) {
+                        baseProcess.setAllLocationStatus("2,2");
+                    }
+
                     processMapper.updateById(baseProcess);
                     pcrMapper.updateById(billPcr);
                     return new Result(10000, "修改成功！", true);
@@ -467,6 +527,14 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setProcessType(2);
                     }
+
+                    if (baseLocation.getId() == 15) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                    }
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                     baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                     baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
@@ -474,6 +542,35 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "2," + 0);
 
+                    if (baseLocation.getId() == 9) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                    }
+                    if (baseLocation.getId() == 10) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                    }
+                    if (baseLocation.getId() == 11) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                    }
+                    if (baseLocation.getId() == 17) {
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1]  + status1.substring(3));
+                    }
+
                     billPcr.setBillStatus(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -120,35 +120,51 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         baseProcess.setCurrentStatus("0");
 
         QueryWrapper<BaseLocation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("vistit_type", vistitType).eq("farm_id", farmId).orderByAsc("location_type");
-        List<BaseLocation> baseLocations = baseLocationMapper.selectList(queryWrapper);
-        if (admissionType.equals("1")) {
-            baseProcess.setAllLocation("场外," + destName);
-            QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId).eq("vistit_type", vistitType).eq("location_type", 0);
-            baseProcess.setAllLocationId(baseLocationMapper.selectOne(queryWrapper1).getId() + "," + destId);
-            baseProcess.setAllLocationStatus("1,0");
+        if (vistitType.equals("5")) {
+            if (destId.equals("9")) {
+                baseProcess.setAllLocationStatus("1,0");
+                baseProcess.setAllLocation("场外,车辆初级洗消站");
+                baseProcess.setAllLocationId("26,9");
+            } else if (destId.equals("10")) {
+                baseProcess.setAllLocationId("9,10");
+                baseProcess.setAllLocation("车辆初级洗消站,车辆二级洗消站");
+                baseProcess.setAllLocationStatus("1,0");
+            } else if (destId.equals("11")) {
+                baseProcess.setAllLocationId("10,11");
+                baseProcess.setAllLocation("车辆二级洗消站,车辆三级洗消站");
+                baseProcess.setAllLocationStatus("1,0");
+            }
         } else {
-            String allLocation = "";
-            String allLocationId = "";
-            String allLocationStatus = "";
-            for (BaseLocation baseLocation : baseLocations) {
-                if (baseLocation.getId() < Integer.parseInt(destId) || baseLocation.getId() >= 20) {
-                    allLocation = allLocation + baseLocation.getLocationName() + ",";
-                    allLocationId = allLocationId + baseLocation.getId() + ",";
-                    allLocationStatus = allLocationStatus + "0" + ",";
-                }
-                if (baseLocation.getId() == Integer.parseInt(destId)) {
-                    allLocation = allLocation + baseLocation.getLocationName();
-                    allLocationId = allLocationId + baseLocation.getId();
-                    allLocationStatus = allLocationStatus + "0";
+            queryWrapper.eq("vistit_type", vistitType).eq("farm_id", farmId).orderByAsc("location_type");
+            List<BaseLocation> baseLocations = baseLocationMapper.selectList(queryWrapper);
+            if (admissionType.equals("1")) {
+                baseProcess.setAllLocation("场外," + destName);
+                QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).eq("vistit_type", vistitType).eq("location_type", 0);
+                baseProcess.setAllLocationId(baseLocationMapper.selectOne(queryWrapper1).getId() + "," + destId);
+                baseProcess.setAllLocationStatus("1,0");
+            } else {
+                String allLocation = "";
+                String allLocationId = "";
+                String allLocationStatus = "";
+                for (BaseLocation baseLocation : baseLocations) {
+                    if (baseLocation.getId() < Integer.parseInt(destId) || baseLocation.getId() >= 20) {
+                        allLocation = allLocation + baseLocation.getLocationName() + ",";
+                        allLocationId = allLocationId + baseLocation.getId() + ",";
+                        allLocationStatus = allLocationStatus + "0" + ",";
+                    }
+                    if (baseLocation.getId() == Integer.parseInt(destId)) {
+                        allLocation = allLocation + baseLocation.getLocationName();
+                        allLocationId = allLocationId + baseLocation.getId();
+                        allLocationStatus = allLocationStatus + "0";
+                    }
                 }
+                baseProcess.setAllLocation(allLocation);
+                baseProcess.setAllLocationId(allLocationId);
+                String[] split = allLocationStatus.split(",");
+                split[0] = "1";
+                baseProcess.setAllLocationStatus(split[0] + allLocationStatus.substring(1));
             }
-            baseProcess.setAllLocation(allLocation);
-            baseProcess.setAllLocationId(allLocationId);
-            String[] split = allLocationStatus.split(",");
-            split[0] = "1";
-            baseProcess.setAllLocationStatus(split[0] + allLocationStatus.substring(1));
         }
 
 
@@ -533,7 +549,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             admissionVos = billPersonnelAdmissionMapper.admissionTail(queryWrapper);
         }
         for (BillAdmissionVo admissionVo : admissionVos) {
-            admissionVo.setCommitCount(admissionVo.getPassCount()+admissionVo.getRefuseCount());
+            admissionVo.setCommitCount(admissionVo.getPassCount() + admissionVo.getRefuseCount());
         }
         return new Result(ResultCode.SUCCESS, admissionVos);
     }
@@ -702,13 +718,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
         } else {
             if (billPcr.getDestId() >= billPcr.getTestLocationId()) {
-                if (billPcr.getBillStatus() != 0) {
-                    return new Result(10001, "该订单已通过，无需再次提交！", false);
-                }//说明当前不是目的地
+                //说明当前不是目的地
                 if ("1".equals(type)) {
 
-
-
                     billPcr.setBillStatus(1);
                     billPcr.setPcrType(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
@@ -771,17 +783,16 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
                     String status1 = baseProcess.getAllLocationStatus();
                     String[] split1 = status1.split(",");
-                    split1[0] = "3";
-                    baseProcess.setAllLocationStatus(split1[0] + status1.substring(1));
+                    split1[0] = "2";
+                    split1[1] = "3";
+                    baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + status1.substring(3));
 
                     processMapper.updateById(baseProcess);
                     pcrMapper.updateById(billPcr);
                     return new Result(10000, "修改成功！", true);
                 }
             } else {
-                if (billPcr.getBillStatus() != 0) {
-                    return new Result(10001, "该订单已通过，无需再次提交！", false);
-                }
+
                 if ("1".equals(type)) {
 
                     billPcr.setBillStatus(1);
@@ -801,6 +812,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     baseProcess.setCurrentStatus(substring + "1");
                     baseProcess.setProcessType(1);
 
+                    String status1 = baseProcess.getAllLocationStatus();
+                    String[] split1 = status1.split(",");
+                    split1[0] = "2";
+                    split1[1] = "1";
+                    baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + status1.substring(3));
+
                     processMapper.updateById(baseProcess);
                     pcrMapper.updateById(billPcr);
                     return new Result(10000, "修改成功！", true);
@@ -978,9 +995,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String start = sdf.format(billIsolate.getIsolateStartDate());
         String now = sdf.format(new Date());
         int res = now.compareTo(end);
-        if (billIsolate.getBillStatus() != 0) {
-            return new Result(10001, "该订单已通过，无需再次提交！", false);
-        }
+
         if (res > 0) {//当前时间晚于隔离结束时间
             if (baseProcess.getDestId().equals(billIsolate.getIsolateLocationId()) || baseProcess.getDestId() >= 13) {
                 //目的地就是当前隔离地点
@@ -1030,8 +1045,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             Date endDate = sdf1.parse(now);
             cal1.setTime(startDate);
             cal2.setTime(endDate);
-            long days = (cal2.getTimeInMillis() - cal1.getTimeInMillis()) / (1000 * 3600 * 24);
-            billIsolate.setIsolateRealDayNum(Long.toString(days));
+            long days = (startDate.getTime() - endDate.getTime()) / (1000 * 3600);
+            Integer l1 = (Integer.parseInt(String.valueOf(days / 24)));
+            long l = l1 % 24;
+            String num = l1.toString() + "天" + l + "分钟";
+//            long days = (cal2.getTimeInMillis() - cal1.getTimeInMillis()) / (1000 * 3600 * 24);
+            billIsolate.setIsolateRealDayNum(num);
             billIsolate.setBillStatus(2);
             billIsolate.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
             billIsolate.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
@@ -1214,7 +1233,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     baseProcess.setCurrentStatus(substring + "1");
                     baseProcess.setProcessType(1);
 
-                    baseProcess.setAllLocationStatus("2,2,2");
                 } else {
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                     baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
@@ -1290,6 +1308,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billDry.setPhone(billClean.getPhone());
                     billDry.setCarNum(billClean.getCarNum());
                     billDry.setImgStatus(0);
+                    String status1 = baseProcess.getAllLocationStatus();
+                    String[] split = status1.split(",");
+                    if (billClean.getTestLocationId() == 17) {
+                        split[0] = "2";
+                        split[1] = "1";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                    }
                     dryMapper.insert(billDry);
                 }
                 processMapper.updateById(baseProcess);
@@ -1303,7 +1328,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setTestLocationId(baseLocation.getId());
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
                 billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
-                billClean.setImgStatus(0);
+                billClean.setImgStatus(1);
 
                 baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
@@ -1311,9 +1336,35 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 String status = baseProcess.getCurrentStatus();
                 String substring = status.substring(0, status.length() - 1);
 
+                String status1 = baseProcess.getAllLocationStatus();
+                String[] split = status1.split(",");
+                if (billClean.getTestLocationId() == 12) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
+                if (billClean.getTestLocationId() == 13) {
+                    split[0] = "2";
+                    split[1] = "2";
+                    split[2] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + status1.substring(5));
+                }
+
+                if (billClean.getTestLocationId() == 15 || billClean.getTestLocationId() == 16) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
+
+                if (billClean.getTestLocationId() == 17) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
+
                 baseProcess.setCurrentStatus(substring + "2");
                 baseProcess.setProcessType(2);
-                baseProcess.setAllLocationStatus("2,3,0,0,0");
+
                 processMapper.updateById(baseProcess);
                 cleanMapper.updateById(billClean);
                 return new Result(10000, "修改成功！", true);
@@ -1338,6 +1389,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 if (billClean.getTestLocationId() == 15 || billClean.getDestId() == 16) {
                     baseProcess.setAllLocationStatus("2,2,0");
                 }
+                if (billClean.getTestLocationId() == 17) {
+                    baseProcess.setAllLocationStatus("2,1");
+                }
                 processMapper.updateById(baseProcess);
                 cleanMapper.updateById(billClean);
                 return new Result(10000, "修改成功！", true);
@@ -1356,7 +1410,26 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setTestLocationId(baseLocation.getId());
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
                 billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
-                billClean.setImgStatus(0);
+                billClean.setImgStatus(1);
+
+                String status1 = baseProcess.getAllLocationStatus();
+                String[] split = status1.split(",");
+                if (billClean.getTestLocationId() == 12) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
+                if (billClean.getTestLocationId() == 13) {
+                    split[0] = "2";
+                    split[1] = "2";
+                    split[2] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + status1.substring(5));
+                }
+                if (billClean.getTestLocationId() == 17) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
 
                 processMapper.updateById(baseProcess);
                 cleanMapper.updateById(billClean);
@@ -1466,6 +1539,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     clean.setPhone(billClean.getPhone());
                     clean.setCarNum(billClean.getCarNum());
                     clean.setImgStatus(0);
+                    baseProcess.setAllLocationStatus("2,1,0");
                     cleanMapper.insert(clean);
                 }
 
@@ -1480,7 +1554,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setTestLocationId(baseLocation.getId());
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
                 billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
-                billClean.setImgStatus(0);
+                billClean.setImgStatus(1);
 
                 baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
@@ -1488,6 +1562,31 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 String status = baseProcess.getCurrentStatus();
                 String substring = status.substring(0, status.length() - 1);
 
+                String status1 = baseProcess.getAllLocationStatus();
+                String[] split = status1.split(",");
+                if (billClean.getTestLocationId() == 12) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
+                if (billClean.getTestLocationId() == 13) {
+                    split[0] = "2";
+                    split[1] = "2";
+                    split[2] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + status1.substring(5));
+                }
+
+                if (billClean.getTestLocationId() == 15) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
+                if (billClean.getTestLocationId() == 17) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
+
                 baseProcess.setCurrentStatus(substring + "2");
                 baseProcess.setProcessType(2);
                 processMapper.updateById(baseProcess);
@@ -1511,6 +1610,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 String substring = status.substring(0, status.length() - 1);
                 baseProcess.setCurrentStatus(substring + "1");
                 baseProcess.setProcessType(1);
+
+                if (billClean.getTestLocationId() == 15) {
+                    baseProcess.setAllLocationStatus("2,1,0");
+                }
+
+                if (billClean.getTestLocationId() == 17) {
+                    baseProcess.setAllLocationStatus("2,1,0");
+                }
                 processMapper.updateById(baseProcess);
                 dryMapper.updateById(billClean);
                 return new Result(10000, "修改成功！", true);
@@ -1529,7 +1636,33 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setTestLocationId(baseLocation.getId());
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
                 billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
-                billClean.setImgStatus(0);
+                billClean.setImgStatus(1);
+
+                String status1 = baseProcess.getAllLocationStatus();
+                String[] split = status1.split(",");
+                if (billClean.getTestLocationId() == 12) {
+                    split[0] = "2";
+
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
+                if (billClean.getTestLocationId() == 13) {
+                    split[0] = "2";
+                    split[1] = "2";
+                    split[2] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + status1.substring(5));
+                }
+                if (billClean.getTestLocationId() == 15) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
+
+                if (billClean.getTestLocationId() == 17) {
+                    split[0] = "2";
+                    split[1] = "3";
+                    baseProcess.setAllLocationStatus(split[0] + "," + split[1] + status1.substring(3));
+                }
 
                 processMapper.updateById(baseProcess);
                 dryMapper.updateById(billClean);