Quellcode durchsuchen

后台管理修改

wwh vor 1 Jahr
Ursprung
Commit
91daf34e0c

+ 1 - 0
huimv-receive/src/main/java/com/huimv/receive/entity/BaseProcess.java

@@ -88,4 +88,5 @@ public class BaseProcess implements Serializable {
     private String allLocationStatus;
     private String allLocationStatus;
 
 
 
 
+
 }
 }

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

@@ -104,9 +104,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             }
             }
             QueryWrapper<BillClean> queryWrapper2 = new QueryWrapper<>();
             QueryWrapper<BillClean> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
             queryWrapper2.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
-                    .in("test_location_id", ids).eq("bill_status",0);
+                    .in("test_location_id", ids).eq("bill_status", 0);
 
 
-            return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper),cleanMapper.selectCount(queryWrapper2));
+            return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper), cleanMapper.selectCount(queryWrapper2));
         }/* else if (type.equals("4")) {
         }/* else if (type.equals("4")) {
             Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
@@ -139,7 +139,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     arrayList.add(baseLocation.getId().toString());
                     arrayList.add(baseLocation.getId().toString());
                 }
                 }
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
-                System.out.println("传入自定义sql的位置参数形式:"+s);
+                System.out.println("传入自定义sql的位置参数形式:" + s);
                 cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","), s);
                 cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","), s);
                 queryWrapper.in("test_location_id", arrayList);
                 queryWrapper.in("test_location_id", arrayList);
                 queryWrapper2.in("test_location_id", arrayList);
                 queryWrapper2.in("test_location_id", arrayList);
@@ -174,7 +174,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             queryWrapper2.eq("img_status", 0);
             queryWrapper2.eq("img_status", 0);
             Integer integer = cleanMapper.selectCount(queryWrapper);
             Integer integer = cleanMapper.selectCount(queryWrapper);
             Integer integer1 = dryMapper.selectCount(queryWrapper2);
             Integer integer1 = dryMapper.selectCount(queryWrapper2);
-            return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page,integer+integer1);
+            return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page, integer + integer1);
         }
         }
 
 
     }
     }
@@ -249,8 +249,14 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billPcr.setTestLocationId(3);
                         billPcr.setTestLocationId(3);
                         billPcr.setQualifiedDate(configuration.getPcr());
                         billPcr.setQualifiedDate(configuration.getPcr());
                         pcrMapper.insert(billPcr);
                         pcrMapper.insert(billPcr);
+
+                        String status = baseProcess.getAllLocationStatus();
+                        String[] split1 = status.split(",");
+                        split1[0] = "2";
+                        split1[1] = "1";
+                        baseProcess.setAllLocationStatus(split1[0] + split1[1] + status.substring(3));
                     }
                     }
-                    if (baseLocation.getId() == 3 ) {
+                    if (baseLocation.getId() == 3) {
                         //生成隔离申请
                         //生成隔离申请
                         BillIsolate isolate = new BillIsolate();
                         BillIsolate isolate = new BillIsolate();
                         isolate.setPhone(billClean.getPhone());
                         isolate.setPhone(billClean.getPhone());
@@ -268,6 +274,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         isolate.setIsolateLocation(baseLocation.getLocationName());
                         isolate.setIsolateLocation(baseLocation.getLocationName());
                         isolate.setIsolateLocationId(baseLocation.getId());
                         isolate.setIsolateLocationId(baseLocation.getId());
                         isolateMapper.insert(isolate);
                         isolateMapper.insert(isolate);
+
+                        String status = baseProcess.getAllLocationStatus();
+                        String[] split1 = status.split(",");
+                        split1[0] = "2";
+                        split1[1] = "2";
+                        split1[2] = "1";
+                        baseProcess.setAllLocationStatus(split1[0] + split1[1] + split1[2] + status.substring(5));
                     }
                     }
 
 
                     if (baseLocation.getId() == 4) {
                     if (baseLocation.getId() == 4) {
@@ -292,6 +305,14 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             billPcr.setTestLocationId(4);
                             billPcr.setTestLocationId(4);
                             billPcr.setQualifiedDate(configuration.getPcr());
                             billPcr.setQualifiedDate(configuration.getPcr());
                             pcrMapper.insert(billPcr);
                             pcrMapper.insert(billPcr);
+
+                            String status = baseProcess.getAllLocationStatus();
+                            String[] split1 = status.split(",");
+                            split1[0] = "2";
+                            split1[1] = "2";
+                            split1[2] = "2";
+                            split1[3] = "1";
+                            baseProcess.setAllLocationStatus(split1[0] + split1[1] + split1[2] + split1[3] + status.substring(7));
                         } else {
                         } else {
                             //生成隔离申请
                             //生成隔离申请
                             BillIsolate isolate = new BillIsolate();
                             BillIsolate isolate = new BillIsolate();
@@ -310,6 +331,16 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             isolate.setIsolateLocation(baseLocation.getLocationName());
                             isolate.setIsolateLocation(baseLocation.getLocationName());
                             isolate.setIsolateLocationId(baseLocation.getId());
                             isolate.setIsolateLocationId(baseLocation.getId());
                             isolateMapper.insert(isolate);
                             isolateMapper.insert(isolate);
+
+                            String status = baseProcess.getAllLocationStatus();
+                            String[] split1 = status.split(",");
+                            split1[0] = "2";
+                            split1[1] = "2";
+                            split1[2] = "2";
+                            split1[3] = "2";
+                            split1[4] = "1";
+                            baseProcess.setAllLocationStatus(split1[0] + split1[1] + split1[2] + split1[3] + split1[4]);
+
                         }
                         }
                     }
                     }
 
 
@@ -361,6 +392,20 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 String status = baseProcess.getCurrentStatus();
                 String status = baseProcess.getCurrentStatus();
                 String substring = status.substring(0, status.length() - 1);
                 String substring = status.substring(0, status.length() - 1);
                 baseProcess.setCurrentStatus(substring + "1");
                 baseProcess.setCurrentStatus(substring + "1");
+
+                String s = baseProcess.getAllLocationId();
+                String[] split = s.split(",");
+                Integer s2 = 0;
+                for (int i = 0; i < split.length; i++) {
+                    if (Integer.parseInt(split[i]) == baseLocation.getId()) {
+                        s2 = i;
+                    }
+                }
+                String status1 = baseProcess.getAllLocationStatus();
+                StringBuilder split1 = new StringBuilder(status1);
+                split1.replace(s2, s2 + 1, "3");
+                baseProcess.setAllLocationStatus(split1.toString());
+
                 processMapper.updateById(baseProcess);
                 processMapper.updateById(baseProcess);
                 cleanMapper.updateById(billClean);
                 cleanMapper.updateById(billClean);
                 return new Result(10000, "修改成功!", true);
                 return new Result(10000, "修改成功!", true);
@@ -378,9 +423,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         String pageSize = paramsMap.get("pageSize");
         String pageSize = paramsMap.get("pageSize");
         String vistitType = paramsMap.get("vistitType");
         String vistitType = paramsMap.get("vistitType");
         Page<BillClean> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         Page<BillClean> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
-        QueryWrapper<BillClean> queryWrapper=new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(vistitType),"vistit_type",vistitType).eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
-        return new Result(ResultCode.SUCCESS, billCleanMapper.selectPage(page, new QueryWrapper<BillClean>().eq(StringUtils.isNotBlank(vistitType),"vistit_type",vistitType).eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date")),billCleanMapper.selectCount(queryWrapper));
+        QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(vistitType), "vistit_type", vistitType).eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
+        return new Result(ResultCode.SUCCESS, billCleanMapper.selectPage(page, new QueryWrapper<BillClean>().eq(StringUtils.isNotBlank(vistitType), "vistit_type", vistitType).eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date")), billCleanMapper.selectCount(queryWrapper));
     }
     }
 
 
     @Override
     @Override
@@ -546,7 +591,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 break;
                 break;
         }
         }
 
 
-        return new Result(ResultCode.SUCCESS, cleanAndDryVoPage,cleanAndDryVoPage.getSize());
+        return new Result(ResultCode.SUCCESS, cleanAndDryVoPage, cleanAndDryVoPage.getSize());
     }
     }
 
 
     @Override
     @Override
@@ -556,8 +601,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         String vistitType = paramsMap.get("vistitType");
         String vistitType = paramsMap.get("vistitType");
         Page<CleanAndDryVo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         Page<CleanAndDryVo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
-        Page<CleanAndDryVo> cleanAndDryVoPage = cleanMapper.listPersonalCleanAndDry(page, userId,vistitType);
-        return new Result(ResultCode.SUCCESS, cleanAndDryVoPage,cleanAndDryVoPage.getSize());
+        Page<CleanAndDryVo> cleanAndDryVoPage = cleanMapper.listPersonalCleanAndDry(page, userId, vistitType);
+        return new Result(ResultCode.SUCCESS, cleanAndDryVoPage, cleanAndDryVoPage.getSize());
     }
     }
 
 
     @Override
     @Override
@@ -646,6 +691,11 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                                 admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                                 admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                                 admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                                 admissionMapper.updateById(admission);
                                 admissionMapper.updateById(admission);
+                                if (billClean.getTestLocationId() == 10) {
+                                    baseProcess.setAllLocationStatus("2,2,0");
+                                } else {
+                                    baseProcess.setAllLocationStatus("2,0,0");
+                                }
                             }
                             }
 
 
                         }
                         }
@@ -817,6 +867,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String status = baseProcess.getCurrentStatus();
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "1");
                     baseProcess.setCurrentStatus(substring + "1");
+
+                    baseProcess.setAllLocationStatus("2,2,2");
                     processMapper.updateById(baseProcess);
                     processMapper.updateById(baseProcess);
                 } else {
                 } else {
                     billClean.setImgStatus(1);
                     billClean.setImgStatus(1);
@@ -838,6 +890,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String substring = status.substring(0, status.length() - 1);
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "2");
                     baseProcess.setCurrentStatus(substring + "2");
 
 
+                    baseProcess.setAllLocationStatus("2,3,0");
+
                     processMapper.updateById(baseProcess);
                     processMapper.updateById(baseProcess);
                 }
                 }
                 return new Result(10000, "修改成功!", true);
                 return new Result(10000, "修改成功!", true);
@@ -883,7 +937,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         queryWrapper.eq("farm_id", farmId).in("bill_status", 1, 2);
         queryWrapper.eq("farm_id", farmId).in("bill_status", 1, 2);
         if ("".equals(personType) || null == personType) {
         if ("".equals(personType) || null == personType) {
 
 
-        }else {
+        } else {
             queryWrapper.eq("vistit_type", personType);
             queryWrapper.eq("vistit_type", personType);
         }
         }
         if ("1".equals(type)) {
         if ("1".equals(type)) {
@@ -891,11 +945,11 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             queryWrapper.ge("sub_date", timesmorning);
             queryWrapper.ge("sub_date", timesmorning);
         } else if ("2".equals(type)) {
         } else if ("2".equals(type)) {
             Calendar calendar = Calendar.getInstance();
             Calendar calendar = Calendar.getInstance();
-            calendar.set(Calendar.DATE,calendar.get(Calendar.DATE)-7);
+            calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
             queryWrapper.ge("sub_date", calendar.getTime());
             queryWrapper.ge("sub_date", calendar.getTime());
         } else if ("3".equals(type)) {
         } else if ("3".equals(type)) {
             Date monthmorning = DataUill.getTimesMonthmorning();
             Date monthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("sub_date",monthmorning);
+            queryWrapper.ge("sub_date", monthmorning);
         }
         }
         pcrVos = billCleanMapper.listAll(queryWrapper);
         pcrVos = billCleanMapper.listAll(queryWrapper);
         for (CleanVo pcrVo : pcrVos) {
         for (CleanVo pcrVo : pcrVos) {

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

@@ -118,6 +118,29 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         baseProcess.setSubDate(DateTime.now());
         baseProcess.setSubDate(DateTime.now());
         baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
         baseProcess.setUpdateDate(LocalDateTime.now().format(dateTimeFormatter));
         baseProcess.setCurrentStatus("0");
         baseProcess.setCurrentStatus("0");
+
+        QueryWrapper<BaseLocation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("vistit_type", vistitType).eq("farm_id", farmId).orderByAsc("id");
+        List<BaseLocation> baseLocations = baseLocationMapper.selectList(queryWrapper);
+        String allLocation = "";
+        String allLocationId = "";
+        String allLocationStatus = "";
+        for (BaseLocation baseLocation : baseLocations) {
+            if (baseLocation.getId() < Integer.parseInt(destId)) {
+                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);
+        baseProcess.setAllLocationStatus(allLocationStatus);
+
         //获取位置
         //获取位置
         BaseLocation baseLocation;
         BaseLocation baseLocation;
         if (vistitType.equals("5")) {
         if (vistitType.equals("5")) {
@@ -247,6 +270,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             billPersonnelAdmission.setBillStatus(2);
             billPersonnelAdmission.setBillStatus(2);
             baseProcess.setProcessType(2);
             baseProcess.setProcessType(2);
             baseProcess.setCurrentStatus(String.join(",", split));
             baseProcess.setCurrentStatus(String.join(",", split));
+            baseProcess.setAllLocationStatus("3");
+
 //            SendSMS.sendSMS(phoneList,"拒绝入场申请测试");
 //            SendSMS.sendSMS(phoneList,"拒绝入场申请测试");
         } else {
         } else {
             //通过
             //通过
@@ -267,6 +292,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 baseProcess.setCurrentStatus(result.toString());
                 baseProcess.setCurrentStatus(result.toString());
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
+
+                String status = baseProcess.getAllLocationStatus();
+                String[] split1 = status.split(",");
+                split1[0] = "1";
+                baseProcess.setAllLocationStatus(split1[0] + status.substring(1));
+
                 BillPcr billPcr = new BillPcr();
                 BillPcr billPcr = new BillPcr();
                 billPcr.setVistitType(billPersonnelAdmission.getVistitType());
                 billPcr.setVistitType(billPersonnelAdmission.getVistitType());
                 billPcr.setDestName(billPersonnelAdmission.getDestName());
                 billPcr.setDestName(billPersonnelAdmission.getDestName());
@@ -298,6 +329,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         return Result.SUCCESS();
         return Result.SUCCESS();
     }
     }
 
 
+
     @Override
     @Override
     public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
     public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
         String type = paramsMap.get("type");
@@ -428,6 +460,19 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         for (ListAdmissionVo listAdmissionVo : admissionVo) {
         for (ListAdmissionVo listAdmissionVo : admissionVo) {
             JSONObject jsonObject = new JSONObject();
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("type", listAdmissionVo.getType());
             jsonObject.put("type", listAdmissionVo.getType());
+            if (listAdmissionVo.getType() == 0) {
+                jsonObject.put("name", "人员");
+            } else if (listAdmissionVo.getType() == 1) {
+                jsonObject.put("name", "环保车");
+            } else if (listAdmissionVo.getType() == 2) {
+                jsonObject.put("name", "拉猪车");
+            } else if (listAdmissionVo.getType() == 3) {
+                jsonObject.put("name", "饲料车");
+            } else if (listAdmissionVo.getType() == 4) {
+                jsonObject.put("name", "送猪车");
+            } else if (listAdmissionVo.getType() == 5) {
+                jsonObject.put("name", "物资车");
+            }
             jsonObject.put("count", listAdmissionVo.getCount());
             jsonObject.put("count", listAdmissionVo.getCount());
             jsonArray.add(jsonObject);
             jsonArray.add(jsonObject);
         }
         }
@@ -485,7 +530,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             endTime = LocalDateTime.now() + " 23:59:59";
             endTime = LocalDateTime.now() + " 23:59:59";
         }
         }
         QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
         QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(destId),"dest_id", destId).eq(StringUtils.isNotBlank(type),"vistit_type",type);
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(destId), "dest_id", destId).eq(StringUtils.isNotBlank(type), "vistit_type", type);
         queryWrapper.between("sub_date", startTime, endTime);
         queryWrapper.between("sub_date", startTime, endTime);
         Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, billPersonnelAdmissionMapper.selectPage(page, queryWrapper));
         return new Result(ResultCode.SUCCESS, billPersonnelAdmissionMapper.selectPage(page, queryWrapper));
@@ -689,6 +734,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
 
                     baseProcess.setCurrentStatus(substring + "2");
                     baseProcess.setCurrentStatus(substring + "2");
                     baseProcess.setProcessType(2);
                     baseProcess.setProcessType(2);
+
+                    String status1 = baseProcess.getAllLocationStatus();
+                    String[] split1 = status1.split(",");
+                    split1[0] = "3";
+                    baseProcess.setAllLocationStatus(split1[0] + status1.substring(1));
+
                     processMapper.updateById(baseProcess);
                     processMapper.updateById(baseProcess);
                     pcrMapper.updateById(billPcr);
                     pcrMapper.updateById(billPcr);
                     return new Result(10000, "修改成功!", true);
                     return new Result(10000, "修改成功!", true);
@@ -711,6 +762,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     String substring = status.substring(0, status.length() - 1);
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "1");
                     baseProcess.setCurrentStatus(substring + "1");
                     baseProcess.setProcessType(1);
                     baseProcess.setProcessType(1);
+
                     processMapper.updateById(baseProcess);
                     processMapper.updateById(baseProcess);
                     pcrMapper.updateById(billPcr);
                     pcrMapper.updateById(billPcr);
                     return new Result(10000, "修改成功!", true);
                     return new Result(10000, "修改成功!", true);
@@ -731,6 +783,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billPcr.setPassDate(sdf.parse(sdf.format(new Date())));
                     billPcr.setPassDate(sdf.parse(sdf.format(new Date())));
                     billPcr.setCheckDate(sdf.parse(data));
                     billPcr.setCheckDate(sdf.parse(data));
 
 
+                    String status1 = baseProcess.getAllLocationStatus();
+                    String[] split1 = status.split(",");
+                    split1[0] = "3";
+                    baseProcess.setAllLocationStatus(split1[0] + status1.substring(1));
+
                     processMapper.updateById(baseProcess);
                     processMapper.updateById(baseProcess);
                     pcrMapper.updateById(billPcr);
                     pcrMapper.updateById(billPcr);
                     return new Result(10000, "修改成功!", true);
                     return new Result(10000, "修改成功!", true);
@@ -912,6 +969,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setTestLocationId(4);
                 billClean.setTestLocationId(4);
                 billClean.setPhone(billIsolate.getPhone());
                 billClean.setPhone(billIsolate.getPhone());
                 cleanMapper.insert(billClean);
                 cleanMapper.insert(billClean);
+
+                String status = baseProcess.getAllLocationStatus();
+                String[] split = status.split(",");
+                split[0] = "2";
+                split[1] = "2";
+                split[2] = "2";
+                split[3] = "1";
+                baseProcess.setAllLocationStatus(split[0] + split[1] + split[2] + split[3] + status.substring(7));
             }
             }
 
 
             billIsolate.setIsolateRealEndDate(new Date());
             billIsolate.setIsolateRealEndDate(new Date());
@@ -934,6 +999,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             String substring = status.substring(0, status.length() - 1);
             String substring = status.substring(0, status.length() - 1);
             baseProcess.setCurrentStatus(substring + "1," + 0);
             baseProcess.setCurrentStatus(substring + "1," + 0);
 
 
+            if (billIsolate.getIsolateLocationId() == 5) {
+                baseProcess.setAllLocationStatus("2,2,2,2,2");
+            }
+
             isolateMapper.updateById(billIsolate);
             isolateMapper.updateById(billIsolate);
             processMapper.updateById(baseProcess);
             processMapper.updateById(baseProcess);
             return new Result(10000, "正常解除隔离成功!", true);
             return new Result(10000, "正常解除隔离成功!", true);
@@ -969,6 +1038,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setTestLocationId(4);
                 billClean.setTestLocationId(4);
                 billClean.setPhone(billIsolate.getPhone());
                 billClean.setPhone(billIsolate.getPhone());
                 cleanMapper.insert(billClean);
                 cleanMapper.insert(billClean);
+
+                String status = baseProcess.getAllLocationStatus();
+                String[] split = status.split(",");
+                split[0] = "2";
+                split[1] = "2";
+                split[2] = "2";
+                split[3] = "1";
+                baseProcess.setAllLocationStatus(split[0] + split[1] + split[2] + split[3] + status.substring(7));
             }
             }
             billIsolate.setIsolateRealEndDate(new Date());
             billIsolate.setIsolateRealEndDate(new Date());
             SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
             SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -990,6 +1067,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             String substring = status.substring(0, status.length() - 1);
             String substring = status.substring(0, status.length() - 1);
             baseProcess.setCurrentStatus(substring + "1," + 0);
             baseProcess.setCurrentStatus(substring + "1," + 0);
 
 
+            if (billIsolate.getIsolateLocationId() == 5) {
+                baseProcess.setAllLocationStatus("2,2,2,2,2");
+            }
+
             isolateMapper.updateById(billIsolate);
             isolateMapper.updateById(billIsolate);
             processMapper.updateById(baseProcess);
             processMapper.updateById(baseProcess);
             return new Result(10000, "提前解除隔离成功!", true);
             return new Result(10000, "提前解除隔离成功!", true);
@@ -1087,6 +1168,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         String substring = status.substring(0, status.length() - 1);
                         String substring = status.substring(0, status.length() - 1);
                         baseProcess.setCurrentStatus(substring + "1");
                         baseProcess.setCurrentStatus(substring + "1");
                         baseProcess.setProcessType(1);
                         baseProcess.setProcessType(1);
+
+                        baseProcess.setAllLocationStatus("2,2");
                     } else {
                     } else {
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
@@ -1185,6 +1268,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
 
                     baseProcess.setCurrentStatus(substring + "2");
                     baseProcess.setCurrentStatus(substring + "2");
                     baseProcess.setProcessType(2);
                     baseProcess.setProcessType(2);
+                    baseProcess.setAllLocationStatus("3");
                     processMapper.updateById(baseProcess);
                     processMapper.updateById(baseProcess);
                     cleanMapper.updateById(billClean);
                     cleanMapper.updateById(billClean);
                     return new Result(10000, "修改成功!", true);
                     return new Result(10000, "修改成功!", true);
@@ -1264,7 +1348,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
                     billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
 
 
                     //最终结束
                     //最终结束
-                    if (billClean.getTestLocationId() == 13 || billClean.getTestLocationId() == 58 || billClean.getTestLocationId() == 43) {
+                    if (billClean.getTestLocationId() == 13 || billClean.getTestLocationId() == 17 || billClean.getTestLocationId() == 43) {
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
@@ -1272,6 +1356,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         String substring = status.substring(0, status.length() - 1);
                         String substring = status.substring(0, status.length() - 1);
                         baseProcess.setCurrentStatus(substring + "1");
                         baseProcess.setCurrentStatus(substring + "1");
                         baseProcess.setProcessType(1);
                         baseProcess.setProcessType(1);
+                        if (billClean.getTestLocationId() == 17) {
+                            baseProcess.setAllLocationStatus("2,2");
+                        } else {
+                            baseProcess.setAllLocationStatus("2,2,2");
+                        }
                     } else {
                     } else {
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());

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

@@ -38,7 +38,7 @@ public class SafeTimer {
     private ISysUserService sysUserService;
     private ISysUserService sysUserService;
 
 
 
 
-    @Scheduled(cron = "0 0/1 * * * ? ")
+    @Scheduled(cron = "0 0/10 * * * ? ")
     private void getShenChan() throws Exception {
     private void getShenChan() throws Exception {
         QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
         QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("bill_status", 1);
         queryWrapper.eq("bill_status", 1);
@@ -56,7 +56,7 @@ public class SafeTimer {
         }
         }
     }
     }
 
 
-    @Scheduled(cron = "0 0/1 * * * ? ")
+    @Scheduled(cron = "0 0/10 * * * ? ")
     private void pcr() throws Exception {
     private void pcr() throws Exception {
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("bill_status", 0);
         queryWrapper.eq("bill_status", 0);