产蛋采食修改

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

@@ -193,16 +193,15 @@ 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)
-                .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.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId)
+               /* .ge("call_date", calendar.getTime())*/;
         QueryWrapper<EnvRegularCallEgg> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId).like(StringUtils.isNotBlank(duckId), "duck_id", duckId);
+        queryWrapper1.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId);
         queryWrapper1.select(" IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum");
         EnvRegularCallEgg egg = eggMapper.selectOne(queryWrapper1);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("eggNum", egg.getEggNum());
-        jsonObject.put("egg", eggMapper.selectList(queryWrapper));
+        jsonObject.put("egg", eggMapper.listDay(queryWrapper));
         jsonObject.put("eggWeight", egg.getDuckWeight());
         return new Result(ResultCode.SUCCESS, jsonObject);
     }

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

@@ -106,7 +106,7 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         Date timesMonthmorning = DataUill.getTimesmorning();
         QueryWrapper<EnvRegularCallFeeding> queryWrapper = new QueryWrapper<>();
         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")
+                .select("SUM(duck_weight) duckWeight,duck_num duckNum,call_date callDate,unit_name unitName,duck_id duckId")
                 .ge("call_date", timesMonthmorning)
                 .orderByDesc("call_date");
         Page<EnvRegularCallFeeding> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
@@ -121,10 +121,9 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
         queryWrapper.eq("farm_id", farmId).eq("event_type",0)
-                .like(StringUtils.isNotBlank(duckId),"duck_id", duckId)
-                .select("SUM(duck_weight) duckWeight,duck_num duckNum,call_date callDate")
+                .eq(StringUtils.isNotBlank(duckId),"duck_id", duckId)
                 .ge("call_date", calendar.getTime());
-        return new Result(ResultCode.SUCCESS, feedingMapper.selectList(queryWrapper));
+        return new Result(ResultCode.SUCCESS, feedingMapper.listDay(queryWrapper));
     }
 
     @Override

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallEggMapper.xml

@@ -16,7 +16,7 @@
     </resultMap>
 
     <select id="listDay" resultType="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
-        SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',(IFNUll(sum(duck_weight),'0')) 'duckWeight',call_date 'callDate' FROM `env_regular_call_egg`
+        SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',(IFNUll(sum(duck_weight),'0')) 'duckWeight',call_date 'callDate',duck_num duckNum FROM `env_regular_call_egg`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
         ORDER BY call_date ASC