大屏弹窗修改2

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

@@ -273,7 +273,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         List<EnvMoveCallVo> envMoveCallVos = moveCallMapper.listScreen(queryWrapper);
 
         QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum)
+        queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum).eq("event_type", 0)
         /*.ge("call_date", calendar.getTime())*/;
 
         List<EnvRegularCallFeedingVo> envRegularCallFeedingVos = feedingMapper.listScreen(queryWrapper1);

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

@@ -57,10 +57,9 @@
     </select>
 
     <select id="listScreen" resultType="com.huimv.guowei.admin.entity.vo.EnvRegularCallFeedingVo">
-        SELECT (IFNUll(sum(duck_weight)),'0') 'duckWeight',duck_num 'duckNum',call_date 'callDate',Round(avg(duck_weight),2) avgWeight  FROM `env_regular_call_feeding`
+        SELECT duck_weight 'duckWeight',duck_num 'duckNum',call_date 'callDate',Round(avg(duck_weight),2) avgWeight  FROM `env_regular_call_feeding`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
-        And event_type = 0
         ORDER BY call_date ASC
     </select>
 </mapper>