大屏控制展示修改3

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.java

@@ -35,4 +35,6 @@ public interface EnvRegularCallFeedingMapper extends BaseMapper<EnvRegularCallFe
 
     List<EnvRegularCallFeedingVo> listScreen(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
 
+    List<EnvRegularCallFeeding> listDayDesc(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
+
 }

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

@@ -250,7 +250,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         /*Date timesmorning = DataUill.getTimesmorning();*/
         QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum)/*.ge("call_date",timesmorning)*/;
-        List<EnvRegularCallFeeding> feedings = feedingMapper.listDay(queryWrapper1);
+        List<EnvRegularCallFeeding> feedings = feedingMapper.listDayDesc(queryWrapper1);
         JSONArray jsonArray = new JSONArray();
         for (EnvRegularCallFeeding feeding : feedings) {
             String s = feeding.getDuckNum() + "号鸭进食" + feeding.getDuckWeight() + "g,";

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

@@ -22,6 +22,12 @@
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
         ORDER BY call_date ASC
     </select>
+    <select id="listDayDesc" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
+        SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_num 'duckNum',call_date 'callDate' FROM `env_regular_call_feeding`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
+        ORDER BY call_date DESC
+    </select>
 
     <select id="listPage" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
         SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',call_date 'callDate' FROM `env_regular_call_feeding`