生物安全车辆修改5

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

@@ -294,9 +294,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             return new Result(ResultCode.SUCCESS, billPcrMapper.selectById(id));
         } else if (type.equals("2")) {
             return new Result(ResultCode.SUCCESS, billCleanMapper.selectById(id));
-        } else if (type.equals("4")){
+        } else if (type.equals("4")) {
             return new Result(ResultCode.SUCCESS, dryMapper.selectById(id));
-        }else {
+        } else {
             return new Result(ResultCode.SUCCESS, billIsolateMapper.selectById(id));
         }
     }
@@ -754,25 +754,25 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0).orderByDesc("sub_date");
         if ("0".equals(type)) {
-            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, "0,1,2".split(","));
+            cleanAndDryVo2Page = cleanMapper.CleanAndDry2(page, farmId, "0,1,2".split(","));
         }
         ArrayList<String> arrayList = new ArrayList<>();
         if ("1".equals(type)) {
             arrayList.add("0");
             String[] s = arrayList.toArray(new String[arrayList.size()]);
-            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, s);
+            cleanAndDryVo2Page = cleanMapper.CleanAndDry2(page, farmId, s);
         }
         if ("2".equals(type)) {
             arrayList.add("1");
             String[] s = arrayList.toArray(new String[arrayList.size()]);
-            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, s);
+            cleanAndDryVo2Page = cleanMapper.CleanAndDry2(page, farmId, s);
         }
         if ("3".equals(type)) {
             arrayList.add("2");
             String[] s = arrayList.toArray(new String[arrayList.size()]);
-            cleanAndDryVo2Page =   cleanMapper.CleanAndDry2(page, farmId, s);
+            cleanAndDryVo2Page = cleanMapper.CleanAndDry2(page, farmId, s);
         }
-        return new Result(ResultCode.SUCCESS,cleanAndDryVo2Page);
+        return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page);
 
     }
 
@@ -810,12 +810,24 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billClean.setPassDate(sdf.parse(sdf.format(new Date())));
                     billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
 
-                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
-                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
-                    String status = baseProcess.getCurrentStatus();
-                    String substring = status.substring(0, status.length() - 1);
-                    baseProcess.setCurrentStatus(substring + "1," + 0);
+                    //拉猪车结束
+                    if (billClean.getTestLocationId() == 29) {
+                        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");
+                        baseProcess.setProcessType(1);
+                    } else {
+                        baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
+                        String status = baseProcess.getCurrentStatus();
+                        String substring = status.substring(0, status.length() - 1);
+                        baseProcess.setCurrentStatus(substring + "1," + 0);
+                    }
+
 
                     //环保车洗消合格生成烘干申请
                     if (billClean.getTestLocationId() == 18 || billClean.getTestLocationId() == 21) {
@@ -976,12 +988,23 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billClean.setPassDate(sdf.parse(sdf.format(new Date())));
                     billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
 
-                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
-                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
-                    String status = baseProcess.getCurrentStatus();
-                    String substring = status.substring(0, status.length() - 1);
-                    baseProcess.setCurrentStatus(substring + "1," + 0);
+                    //最终结束
+                    if (billClean.getTestLocationId() == 60 || billClean.getTestLocationId() == 58 || billClean.getTestLocationId() == 43) {
+                        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");
+                        baseProcess.setProcessType(1);
+                    } else {
+                        baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
+                        String status = baseProcess.getCurrentStatus();
+                        String substring = status.substring(0, status.length() - 1);
+                        baseProcess.setCurrentStatus(substring + "1," + 0);
+                    }
 
                     //环保车烘干合格生成洗消申请
                     if (billClean.getTestLocationId() == 19) {