|
@@ -305,7 +305,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
String farmId = paramsMap.get("farmId");
|
|
|
QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
|
- queryWrapper.eq("farm_id", farmId).eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
|
|
|
+ queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date");
|
|
|
if ("0".equals(type)) {
|
|
|
queryWrapper.in("pcr_type", 1, 2, 3);
|
|
|
}
|
|
@@ -477,7 +477,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
}
|
|
|
String farmId = paramsMap.get("farmId");
|
|
|
QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("farm_id", farmId).eq("isolate_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
|
|
|
+ queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date");
|
|
|
if ("0".equals(type)) {
|
|
|
queryWrapper.in("bill_status", 0, 1, 2, 3);
|
|
|
}
|
|
@@ -608,7 +608,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
}
|
|
|
String farmId = paramsMap.get("farmId");
|
|
|
QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("farm_id", farmId).eq("test_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
|
|
|
+ queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date");
|
|
|
if ("0".equals(type)) {
|
|
|
queryWrapper.in("bill_status", 0, 1, 2);
|
|
|
}
|