|
@@ -225,11 +225,10 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
String farmId = paramsMap.get("farmId");
|
|
String farmId = paramsMap.get("farmId");
|
|
QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.eq("farm_id", farmId);
|
|
queryWrapper.eq("farm_id", farmId);
|
|
- Date timesmorning = DataUill.getTimesmorning();
|
|
|
|
- queryWrapper.ge("sub_date", timesmorning);
|
|
|
|
Integer integer = pcrMapper.selectCount(queryWrapper);//检测总数
|
|
Integer integer = pcrMapper.selectCount(queryWrapper);//检测总数
|
|
queryWrapper.in("bill_status", 1,3);
|
|
queryWrapper.in("bill_status", 1,3);
|
|
Integer integer1 = pcrMapper.selectCount(queryWrapper);//合格总数
|
|
Integer integer1 = pcrMapper.selectCount(queryWrapper);//合格总数
|
|
|
|
+ queryWrapper.orderByDesc("sub_date").last(" limit 10");
|
|
DecimalFormat def = new DecimalFormat("0.00");
|
|
DecimalFormat def = new DecimalFormat("0.00");
|
|
String rank;
|
|
String rank;
|
|
if (integer == 0 || integer == null) {
|
|
if (integer == 0 || integer == null) {
|