隔离查询

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

@@ -47,7 +47,8 @@ public class BillIsolateServiceImpl extends ServiceImpl<BillIsolateMapper, BillI
 
     @Override
     public Result Isolate(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        String type = paramsMap.get("type");//0全部  1为人员二级洗消站 2为生产区
+        String type = paramsMap.get("type");//0全部
+        String farmId = paramsMap.get("farmId");
         if ("".equals(type) || null == type) {
             type = "0";
         }
@@ -57,12 +58,9 @@ public class BillIsolateServiceImpl extends ServiceImpl<BillIsolateMapper, BillI
         }
         List<IsolateVo> isolateVos = null;
         QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
-        if ("0".equals(type)) {
-            queryWrapper.in("isolate_location_id", 3, 4);
-        } else if ("1".equals(type)) {
-            queryWrapper.eq("isolate_location_id", 3);
-        } else if ("2".equals(type)) {
-            queryWrapper.eq("isolate_location_id", 4);
+        queryWrapper.eq("farm_id",farmId);
+        if (!"0".equals(type)) {
+            queryWrapper.eq("isolate_location_id", type);
         }
         //今日
         if ("1".equals(dateType)) {