产蛋h5修改

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallEggServiceImpl.java

@@ -176,8 +176,11 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         if (pageSize == null || "".equals(pageSize)) {
             pageSize = "10";
         }
+
         QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName), "unit_name", unitName)
+                .select("IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum,duck_num duckNum,unit_name unitName,duck_id duckId")
+                .groupBy("duck_num")
                 .orderByDesc("call_date");
         Page<EnvRegularCallEgg> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, eggMapper.selectPage(page, queryWrapper));
@@ -190,7 +193,9 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(duckId), "duck_id", duckId).ge("call_date", calendar.getTime());
+        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(duckId), "duck_id", duckId)
+                .select("IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum,call_date callDate,duck_num duckNum")
+                .ge("call_date", calendar.getTime()).orderByDesc("call_date");
         QueryWrapper<EnvRegularCallEgg> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).like(StringUtils.isNotBlank(duckId), "duck_id", duckId);
         queryWrapper1.select(" IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum");

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java

@@ -103,8 +103,11 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         if (pageSize == null || "".equals(pageSize)) {
             pageSize = "10";
         }
+        Date timesMonthmorning = DataUill.getTimesmorning();
         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)
+                .select("SUM(duck_weight) duckWeight,duck_num duckNum,call_date callDate,unit_name unitName")
+                .ge("call_date", timesMonthmorning)
                 .orderByDesc("call_date");
         Page<EnvRegularCallFeeding> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, feedingMapper.selectPage(page, queryWrapper));