判断是否有二级洗消站修改2

huimv-receive/src/main/java/com/huimv/receive/controller/BaseLocationController.java

@@ -45,7 +45,7 @@ public class BaseLocationController {
         if (one.getExist() == 1 && vistitType.equals("3")) {
             return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
                     .eq("farm_id", farmId).eq("vistit_type", vistitType)
-                    .ne("location_type", 0).ne("id",6)));
+                    .ne("location_type", 0).ne("id",7)));
         }
         if (one.getExist() == 1 && vistitType.equals("5")) {
             return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()

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

@@ -169,8 +169,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         baseProcess.setAllLocationId("20,1,2,4,5");
                         baseProcess.setAllLocationStatus("1,0,0,0,0");
                     }
-                }
-                if (vistitType.equals("3") && exist.getExist() == 1 && Integer.parseInt(destId) > 7) {
+                } else if (vistitType.equals("3") && exist.getExist() == 1 && Integer.parseInt(destId) > 7) {
                     baseProcess.setAllLocation("场外,车辆初级洗消站,中转料塔外围");
                     baseProcess.setAllLocationId("20,6,8");
                     baseProcess.setAllLocationStatus("1,0,0");
@@ -638,10 +637,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     @Override
     public Result allCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-        Calendar currCal=Calendar.getInstance();
+        Calendar currCal = Calendar.getInstance();
         Calendar calendar = Calendar.getInstance();
         calendar.clear();
-        calendar.set(Calendar.YEAR,currCal.get(Calendar.YEAR));
+        calendar.set(Calendar.YEAR, currCal.get(Calendar.YEAR));
         Date time = calendar.getTime();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         String firstday = format.format(time);
@@ -657,7 +656,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         Integer integer2 = billGoodsInventoryMapper.selectCount(goodsInventoryQueryWrapper);
         jsonObject.put("pcr", integer);
         jsonObject.put("clean", integer1);
-        jsonObject.put("goods",integer2);
+        jsonObject.put("goods", integer2);
         jsonObject.put("allCount", integer + integer1 + integer2);
         jsonObject.put("look", "22");
         return new Result(ResultCode.SUCCESS, jsonObject);
@@ -672,7 +671,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return new Result(10001, "图片上传失败", false);
             }
-            imageCom =  uploadImage.getImageCom(imgUrl);
+            imageCom = uploadImage.getImageCom(imgUrl);
         }
 
         billPersonnelAdmission.setUserImgUrl(imageCom);
@@ -682,7 +681,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         sysAccountMultilevel.setId(billPersonnelAdmission.getAdmissionUserId());
         sysAccountMultilevel.setImgUrl(imageCom);
         sysAccountMultilevelMapper.updateById(sysAccountMultilevel);
-        return new Result(10000,"修改成功",true);
+        return new Result(10000, "修改成功", true);
     }
 
     /*数组排序*/