料塔余量修改14

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/mapper/mapping/FeedingFatMapper.xml

@@ -25,6 +25,7 @@
     FROM `feeding_fat`
     ${ew.customSqlSegment}
     group by eartag_num
+    order create_time asc
     </select>
 
     <select id="listFeedDetail" resultType="vip.xiaonuo.modular.feed.feedingfat.vo.FeedingFatVo2">

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/service/impl/FeedingFatServiceImpl.java

@@ -115,8 +115,7 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
         queryWrapper.eq("org_id", orgId)
                 .like(StringUtils.isNotBlank(eartagNum), "eartag_num", eartagNum)
                 .or().like(StringUtils.isNotBlank(eartagNum), "device_code", eartagNum)
-                .between(StringUtils.isNotBlank(startDate), "create_time", startDate, endDate)
-                .orderByAsc("create_time");
+                .between(StringUtils.isNotBlank(startDate), "create_time", startDate, endDate);
         Page<FeedingFat> page = new Page<>(pageNum, pageSize);
         IPage<FeedingFatVo> fatVoIPage = fatMapper.listFeedPage(page, queryWrapper);
         return fatVoIPage;