|
@@ -121,7 +121,9 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
|
|
|
} else {
|
|
|
|
|
|
QueryWrapper<EnvRegularCallFeeding> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName), "unit_name", unitName)
|
|
|
+ queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName), "unit_name", unitName).or()
|
|
|
+ .like(StringUtils.isNotBlank(unitName), "chi_num", unitName).or()
|
|
|
+ .like(StringUtils.isNotBlank(unitName), "jiao_num", unitName)
|
|
|
.select("IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,call_date callDate,unit_name unitName,duck_id duckId,call_code callCode")
|
|
|
.ge("call_date", timesMonthmorning)
|
|
|
.orderByDesc("call_date");
|