正康牧场映射横路

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

@@ -1603,10 +1603,15 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         }
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("pass_date");
+        if ("21".equals(farmId)) {
+            queryWrapper.eq("farm_id", 26);
+        }else {
+            queryWrapper.eq("farm_id", farmId);
+        }
         if (type.equals("1")) {
-            queryWrapper.eq("farm_id", farmId).eq("vistit_type", 0).ne("bill_status", 0);
+            queryWrapper.eq("vistit_type", 0).ne("bill_status", 0);
         } else {
-            queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0).ne("bill_status", 0);
+            queryWrapper.ne("vistit_type", 0).ne("bill_status", 0);
         }
 
         return new Result(ResultCode.SUCCESS, billCleanMapper.selectList(queryWrapper));

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

@@ -64,7 +64,12 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
         QueryWrapper<BillGoodsInventory> queryWrapper = new QueryWrapper<>();
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-        queryWrapper.ge("create_date", calendar.getTime()).eq("farm_id", farmId);
+        if ("21".equals(farmId)) {
+            queryWrapper.eq("farm_id", 26);
+        } else {
+            queryWrapper.eq("farm_id", farmId);
+        }
+        queryWrapper.ge("create_date", calendar.getTime());
         List<BillGoodsInventoryVo> billGoodsInventoryVos = inventoryMapper.listAll(queryWrapper);
         return new Result(ResultCode.SUCCESS, billGoodsInventoryVos);
     }

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

@@ -227,7 +227,11 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
     public Result PcrList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
+        if ("21".equals(farmId)) {
+            queryWrapper.eq("farm_id", 26);
+        } else {
+            queryWrapper.eq("farm_id", farmId);
+        }
         Integer integer = pcrMapper.selectCount(queryWrapper);//检测总数
         queryWrapper.in("bill_status", 1, 3);
         Integer integer1 = pcrMapper.selectCount(queryWrapper);//合格总数

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

@@ -944,7 +944,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         }
         if ("1".equals(type)) {
             QueryWrapper<BillAccessDoor> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
+            if ("21".equals(farmId)) {
+                queryWrapper.eq("farm_id", 26).orderByDesc("check_date");
+            } else {
+                queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
+            }
             if ("1".equals(status)) {
                 queryWrapper.eq("bill_status", 1);
             } else if ("2".equals(status)) {
@@ -954,7 +958,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             return new Result(ResultCode.SUCCESS, doorMapper.selectPage(page, queryWrapper));
         } else {
             QueryWrapper<BillGate> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
+            if ("21".equals(farmId)) {
+                queryWrapper.eq("farm_id", 26).orderByDesc("check_date");
+            } else {
+                queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
+            }
             if ("1".equals(status)) {
                 queryWrapper.eq("bill_status", 1);
             } else if ("2".equals(status)) {
@@ -1173,11 +1181,17 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         String firstday = format.format(time);
         QueryWrapper<BillClean> cleanQueryWrapper = new QueryWrapper<>();
-        cleanQueryWrapper.eq("farm_id", farmId).ge("sub_date", firstday);
         QueryWrapper<BillPcr> pcrQueryWrapper = new QueryWrapper<>();
-        pcrQueryWrapper.eq("farm_id", farmId).ge("sub_date", firstday);
         QueryWrapper<BillGoodsInventory> goodsInventoryQueryWrapper = new QueryWrapper<>();
-        goodsInventoryQueryWrapper.ge("create_date", firstday).eq("farm_id", farmId);
+        if ("21".equals(farmId)) {
+            cleanQueryWrapper.eq("farm_id", 26).ge("sub_date", firstday);
+            pcrQueryWrapper.eq("farm_id", 26).ge("sub_date", firstday);
+            goodsInventoryQueryWrapper.ge("create_date", firstday).eq("farm_id", 26);
+        } else {
+            cleanQueryWrapper.eq("farm_id", farmId).ge("sub_date", firstday);
+            pcrQueryWrapper.eq("farm_id", farmId).ge("sub_date", firstday);
+            goodsInventoryQueryWrapper.ge("create_date", firstday).eq("farm_id", farmId);
+        }
         JSONObject jsonObject = new JSONObject();
         Integer integer = pcrMapper.selectCount(pcrQueryWrapper);
         Integer integer1 = cleanMapper.selectCount(cleanQueryWrapper);