大屏弹窗修改3

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

@@ -400,7 +400,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         List<EnvMoveCall> moveCalls = moveCallMapper.selectList(callQueryWrapper);
         if (moveCalls.size() == 0) {
             QueryWrapper<EnvMoveCall> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId);
+            queryWrapper.eq("farm_id", farmId).ge("call_date",dateTime);
             List<EnvMoveCallVo> envMoveCallVos = moveCallMapper.listScreen2(queryWrapper);
             for (EnvMoveCallVo envMoveCallVo : envMoveCallVos) {
                 EnvMoveCallVo moveCallVo = new EnvMoveCallVo();
@@ -450,7 +450,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         List<EnvRegularCallFeeding> feedings = feedingMapper.selectList(feedingQueryWrapper);
         if (feedings.size() == 0) {
             QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId).eq("event_type", 0);
+            queryWrapper1.eq("farm_id", farmId).eq("event_type", 0).ge("call_date",dateTime);
             List<EnvRegularCallFeedingVo> envRegularCallFeedingVos = feedingMapper.listScreen2(queryWrapper1);
             queryWrapper1.groupBy("duck_num");
             List<EnvRegularCallFeeding> list = feedingMapper.selectList(queryWrapper1);

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

@@ -35,6 +35,6 @@
         SELECT ROUND(avg(duck_weight),2) avgWeight,call_date callDate FROM `env_move_call`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
-        ORDER BY dayage ASC
+        ORDER BY call_date ASC
     </select>
 </mapper>