小程序修改

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

@@ -254,7 +254,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         String[] split1 = status.split(",");
                         split1[0] = "2";
                         split1[1] = "1";
-                        baseProcess.setAllLocationStatus(split1[0] + split1[1] + status.substring(3));
+                        baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] + status.substring(3));
                     }
                     if (baseLocation.getId() == 3) {
                         //生成隔离申请
@@ -280,7 +280,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         split1[0] = "2";
                         split1[1] = "2";
                         split1[2] = "1";
-                        baseProcess.setAllLocationStatus(split1[0] + split1[1] + split1[2] + status.substring(5));
+                        baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+ split1[2] + status.substring(5));
                     }
 
                     if (baseLocation.getId() == 4) {
@@ -312,7 +312,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             split1[1] = "2";
                             split1[2] = "2";
                             split1[3] = "1";
-                            baseProcess.setAllLocationStatus(split1[0] + split1[1] + split1[2] + split1[3] + status.substring(7));
+                            baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+ split1[2] +","+ split1[3]+ status.substring(7));
                         } else {
                             //生成隔离申请
                             BillIsolate isolate = new BillIsolate();
@@ -338,8 +338,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             split1[1] = "2";
                             split1[2] = "2";
                             split1[3] = "2";
-                            split1[4] = "1";
-                            baseProcess.setAllLocationStatus(split1[0] + split1[1] + split1[2] + split1[3] + split1[4]);
+                            split1[4] = "2";
+                            baseProcess.setAllLocationStatus(split1[0]+"," + split1[1] +","+ split1[2] +","+ split1[3] +","+ split1[4]);
 
                         }
                     }
@@ -719,6 +719,11 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             clean.setTestLocationId(baseLocation.getNextId());
                             clean.setTestLocation(baseLocation.getNextLocation());
                             cleanMapper.insert(clean);
+                            if (billClean.getDestId() == 7) {
+                                baseProcess.setAllLocationStatus("2,1");
+                            } else {
+                                baseProcess.setAllLocationStatus("2,1,0");
+                            }
                         }
 
                         if (billClean.getTestLocationId() == 7) {
@@ -740,6 +745,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             billPcr.setTestLocation(baseLocation.getLocationName());
                             billPcr.setTestLocationId(baseLocation.getId());
                             dryMapper.insert(billPcr);
+                            baseProcess.setAllLocationStatus("2,2,1");
                         }
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
@@ -890,7 +896,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "2");
 
-                    baseProcess.setAllLocationStatus("2,3,0");
+                    baseProcess.setAllLocationStatus("2,2,3");
 
                     processMapper.updateById(baseProcess);
                 }

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

@@ -981,7 +981,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 split[1] = "2";
                 split[2] = "2";
                 split[3] = "1";
-                baseProcess.setAllLocationStatus(split[0] + split[1] + split[2] + split[3] + status.substring(7));
+                baseProcess.setAllLocationStatus(split[0] +","+ split[1] +","+ split[2] +","+ split[3] + status.substring(7));
             }
 
             billIsolate.setIsolateRealEndDate(new Date());
@@ -1050,7 +1050,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 split[1] = "2";
                 split[2] = "2";
                 split[3] = "1";
-                baseProcess.setAllLocationStatus(split[0] + split[1] + split[2] + split[3] + status.substring(7));
+                baseProcess.setAllLocationStatus(split[0] +","+ split[1] +","+ split[2] +","+ split[3] + status.substring(7));
             }
             billIsolate.setIsolateRealEndDate(new Date());
             SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -1363,8 +1363,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         baseProcess.setProcessType(1);
                         if (billClean.getTestLocationId() == 17) {
                             baseProcess.setAllLocationStatus("2,2");
-                        } else {
-                            baseProcess.setAllLocationStatus("2,2,2");
                         }
                     } else {
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
@@ -1395,6 +1393,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         clean.setCarNum(billClean.getCarNum());
                         clean.setImgStatus(0);
                         cleanMapper.insert(clean);
+                        if (billClean.getDestId() == 13) {
+                            baseProcess.setAllLocationStatus("2,1");
+                        } else {
+                            baseProcess.setAllLocationStatus("2,1,0");
+                        }
+
                     }
 
 

huimv-receive/src/main/java/com/huimv/receive/timer/SafeTimer.java

@@ -56,7 +56,7 @@ public class SafeTimer {
         }
     }
 
-    @Scheduled(cron = "0 0/10 * * * ? ")
+    @Scheduled(cron = "0 0/1 * * * ? ")
     private void pcr() throws Exception {
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("bill_status", 1);
@@ -66,7 +66,7 @@ public class SafeTimer {
             Date subDate = pcr.getCheckDate();
             // 将LocalDateTime转换为Date
 
-            if ((subDate.getTime() + pcr.getQualifiedDate() * 60 * 60 * 1000) >= date.getTime()) {
+            if ((subDate.getTime() + pcr.getQualifiedDate() * 60 * 60 * 1000) <= date.getTime()) {
                 pcr.setBillStatus(3);
                 pcrService.updateById(pcr);
             }