小程序

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

@@ -253,8 +253,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         String status = baseProcess.getAllLocationStatus();
                         String[] split1 = status.split(",");
                         split1[0] = "2";
-                        split1[1] = "1";
-                        baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] + status.substring(3));
+                        split1[1] = "2";
+                        split1[2] = "1";
+                        baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+split1[2]+ status.substring(5));
                     }
                     if (baseLocation.getId() == 3) {
                         //生成隔离申请
@@ -279,8 +280,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         String[] split1 = status.split(",");
                         split1[0] = "2";
                         split1[1] = "2";
-                        split1[2] = "1";
-                        baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+ split1[2] + status.substring(5));
+                        split1[2] = "2";
+                        split1[3] = "1";
+                        baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+ split1[2]+","+split1[3] + status.substring(7));
                     }
 
                     if (baseLocation.getId() == 4) {
@@ -311,8 +313,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             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));
+                            split1[3] = "2";
+                            split1[4] = "1";
+                            baseProcess.setAllLocationStatus(split1[0] +","+ split1[1] +","+ split1[2] +","+ split1[3]+","+split1[4]+ status.substring(9));
                         } else {
                             //生成隔离申请
                             BillIsolate isolate = new BillIsolate();
@@ -692,9 +695,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                                 admissionMapper.updateById(admission);
                                 if (billClean.getTestLocationId() == 10) {
-                                    baseProcess.setAllLocationStatus("2,2,0");
+                                    baseProcess.setAllLocationStatus("2,2,2,0");
                                 } else {
-                                    baseProcess.setAllLocationStatus("2,0,0");
+                                    baseProcess.setAllLocationStatus("2,2,0,0");
                                 }
                             }
 
@@ -720,9 +723,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             clean.setTestLocation(baseLocation.getNextLocation());
                             cleanMapper.insert(clean);
                             if (billClean.getDestId() == 7) {
-                                baseProcess.setAllLocationStatus("2,1");
+                                baseProcess.setAllLocationStatus("2,2,1");
                             } else {
-                                baseProcess.setAllLocationStatus("2,1,0");
+                                baseProcess.setAllLocationStatus("2,2,1,0");
                             }
                         }
 
@@ -745,7 +748,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.setAllLocationStatus("2,2,2,1");
                         }
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
@@ -874,7 +877,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "1");
 
-                    baseProcess.setAllLocationStatus("2,2,2");
+                    baseProcess.setAllLocationStatus("2,2,2,2");
                     processMapper.updateById(baseProcess);
                 } else {
                     billClean.setImgStatus(1);
@@ -896,7 +899,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "2");
 
-                    baseProcess.setAllLocationStatus("2,2,3");
+                    baseProcess.setAllLocationStatus("2,2,2,3");
 
                     processMapper.updateById(baseProcess);
                 }

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

@@ -49,10 +49,10 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         String pageSize = paramsMap.get("pageSize");
         String vistitType = paramsMap.get("vistitType");
         Page<BillPcr> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
-        Page<BillPcr> billPcrPage = billPcrMapper.selectPage(page, new QueryWrapper<BillPcr>().eq(StringUtils.isNotBlank(vistitType),"vistit_type",vistitType).eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date"));
-        QueryWrapper<BillPcr> 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, billPcrPage,billPcrMapper.selectCount(queryWrapper));
+        Page<BillPcr> billPcrPage = billPcrMapper.selectPage(page, new QueryWrapper<BillPcr>().eq(StringUtils.isNotBlank(vistitType), "vistit_type", vistitType).eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date"));
+        QueryWrapper<BillPcr> 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, billPcrPage, billPcrMapper.selectCount(queryWrapper));
     }
 
     @Override
@@ -92,15 +92,30 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
 
         } else if ("2".equals(type)) {
             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());
 
         } else if ("3".equals(type)) {
             Date monthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("sub_date",monthmorning);
+            queryWrapper.ge("sub_date", monthmorning);
 
         }
         pcrVos = billPcrMapper.listPcr(queryWrapper);
+        for (PcrVo pcrVo : pcrVos) {
+            if (pcrVo.getType().equals("0")) {
+                pcrVo.setType("人员");
+            } else if (pcrVo.getType().equals("1")) {
+                pcrVo.setType("环保车");
+            } else if (pcrVo.getType().equals("2")) {
+                pcrVo.setType("拉猪车");
+            } else if (pcrVo.getType().equals("3")) {
+                pcrVo.setType("饲料车");
+            } else if (pcrVo.getType().equals("4")) {
+                pcrVo.setType("送猪车");
+            } else if (pcrVo.getType().equals("5")) {
+                pcrVo.setType("物资车");
+            }
+        }
         return new Result(ResultCode.SUCCESS, pcrVos);
     }
 
@@ -119,11 +134,11 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             queryWrapper.ge("sub_date", timesmorning);
         } else if ("2".equals(type)) {
             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());
         } else if ("3".equals(type)) {
             Date monthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("sub_date",monthmorning);
+            queryWrapper.ge("sub_date", monthmorning);
         }
         pcrVos = billPcrMapper.listLocation(queryWrapper);
         return new Result(ResultCode.SUCCESS, pcrVos);
@@ -142,7 +157,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         queryWrapper.eq("farm_id", farmId).in("bill_status", 1, 2);
         if ("".equals(personType) || null == personType) {
 
-        }else {
+        } else {
             queryWrapper.eq("vistit_type", personType);
         }
         if ("1".equals(type)) {
@@ -150,11 +165,11 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             queryWrapper.ge("sub_date", timesmorning);
         } else if ("2".equals(type)) {
             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());
         } else if ("3".equals(type)) {
             Date monthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("sub_date",monthmorning);
+            queryWrapper.ge("sub_date", monthmorning);
         }
         pcrVos = billPcrMapper.listAll(queryWrapper);
         for (PcrVo1 pcrVo : pcrVos) {
@@ -184,7 +199,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         }
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("bill_status", 1, 2);
-        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("check_date", startTime, endTime);
         Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, billPcrMapper.selectPage(page, queryWrapper));
@@ -252,7 +267,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         QueryWrapper<BillPcr> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("farm_id", farmId).in("test_location_id", ids).orderByDesc("sub_date");
         queryWrapper2.eq("bill_status", 0);
-        return new Result(ResultCode.SUCCESS, pcrMapper.selectPage(page, queryWrapper),pcrMapper.selectCount(queryWrapper2));
+        return new Result(ResultCode.SUCCESS, pcrMapper.selectPage(page, queryWrapper), pcrMapper.selectCount(queryWrapper2));
     }
 
     @Override

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

@@ -270,8 +270,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             billPersonnelAdmission.setBillStatus(2);
             baseProcess.setProcessType(2);
             baseProcess.setCurrentStatus(String.join(",", split));
-            baseProcess.setAllLocationStatus("3");
-
+            String status = baseProcess.getAllLocationStatus();
+            String[] split1 = status.split(",");
+            split1[0] = "3";
+            baseProcess.setAllLocationStatus(split1[0] + status.substring(1));
 //            SendSMS.sendSMS(phoneList,"拒绝入场申请测试");
         } else {
             //通过
@@ -295,8 +297,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
                 String status = baseProcess.getAllLocationStatus();
                 String[] split1 = status.split(",");
-                split1[0] = "1";
-                baseProcess.setAllLocationStatus(split1[0] + status.substring(1));
+                split1[0] = "2";
+                split1[1] = "1";
+                baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + status.substring(3));
 
                 BillPcr billPcr = new BillPcr();
                 billPcr.setVistitType(billPersonnelAdmission.getVistitType());
@@ -479,7 +482,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         JSONArray array = jsonArraySort(jsonArray, "value", true);
         for (int i = 0; i < array.size(); i++) {
             JSONObject jsonObject = array.getJSONObject(i);
-            jsonObject.put("rank", i+1);
+            jsonObject.put("rank", i + 1);
         }
 
         return new Result(ResultCode.SUCCESS, array);
@@ -790,8 +793,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
                     String status1 = baseProcess.getAllLocationStatus();
                     String[] split1 = status.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);
@@ -980,8 +984,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 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));
+                split[3] = "2";
+                split[4] = "1";
+                baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3]+"," +split[4]+ status.substring(9));
             }
 
             billIsolate.setIsolateRealEndDate(new Date());
@@ -1005,7 +1010,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             baseProcess.setCurrentStatus(substring + "1," + 0);
 
             if (billIsolate.getIsolateLocationId() == 5) {
-                baseProcess.setAllLocationStatus("2,2,2,2,2");
+                baseProcess.setAllLocationStatus("2,2,2,2,2,2");
             }
 
             isolateMapper.updateById(billIsolate);
@@ -1049,8 +1054,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 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));
+                split[3] = "2";
+                split[4] = "1";
+                baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3]+"," +split[4]+ status.substring(9));
             }
             billIsolate.setIsolateRealEndDate(new Date());
             SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -1073,7 +1079,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             baseProcess.setCurrentStatus(substring + "1," + 0);
 
             if (billIsolate.getIsolateLocationId() == 5) {
-                baseProcess.setAllLocationStatus("2,2,2,2,2");
+                baseProcess.setAllLocationStatus("2,2,2,2,2,2");
             }
 
             isolateMapper.updateById(billIsolate);
@@ -1273,7 +1279,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
                     baseProcess.setCurrentStatus(substring + "2");
                     baseProcess.setProcessType(2);
-                    baseProcess.setAllLocationStatus("3");
+                    baseProcess.setAllLocationStatus("2,3,0,0,0");
                     processMapper.updateById(baseProcess);
                     cleanMapper.updateById(billClean);
                     return new Result(10000, "修改成功！", true);
@@ -1362,7 +1368,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         baseProcess.setCurrentStatus(substring + "1");
                         baseProcess.setProcessType(1);
                         if (billClean.getTestLocationId() == 17) {
-                            baseProcess.setAllLocationStatus("2,2");
+                            baseProcess.setAllLocationStatus("2,2,2");
                         }
                     } else {
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
@@ -1394,9 +1400,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         clean.setImgStatus(0);
                         cleanMapper.insert(clean);
                         if (billClean.getDestId() == 13) {
-                            baseProcess.setAllLocationStatus("2,1");
+                            baseProcess.setAllLocationStatus("2,2,1");
                         } else {
-                            baseProcess.setAllLocationStatus("2,1,0");
+                            baseProcess.setAllLocationStatus("2,2,1,0");
                         }
 
                     }