排序

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/FeedUsageController.java

@@ -37,7 +37,7 @@ public class FeedUsageController {
         String pageNum = map.get("pageNum");
         String pageSize = map.get("pageSize");
         Page<FeedUsage> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        Page<FeedUsage> feedUsagePage = feedUsageService.page(page,new QueryWrapper<FeedUsage>().lambda().orderByDesc(FeedUsage::getUsedDate));
+        Page<FeedUsage> feedUsagePage = feedUsageService.page(page,new QueryWrapper<FeedUsage>().lambda().orderByDesc(FeedUsage::getUsedDate).orderByAsc(FeedUsage::getUnitName));
         return new Result(ResultCode.SUCCESS,feedUsagePage);
     }
 

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/FeedConsumeServiceImpl.java

@@ -91,7 +91,9 @@ public class FeedConsumeServiceImpl extends ServiceImpl<FeedConsumeMapper, FeedC
         String endDate = map.get("endDate");
         FeedConsumeChartVo feedConsumeVo = feedConsumeMapper.getTotal(startDate,endDate);
         List<FeedFormVo> feedFormVos = feedConsumeMapper.list(startDate,endDate);
-        feedConsumeVo.setList(feedFormVos);
+        if (ObjectUtil.isNotEmpty(feedFormVos)){
+            feedConsumeVo.setList(feedFormVos);
+        }
         return new Result(ResultCode.SUCCESS,feedConsumeVo);
     }
 

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/FeedConsumeMapper.xml

@@ -7,10 +7,10 @@
         id, date, time, num1, batch, type, except, reality
     </sql>
     <select id="getTotal" resultType="com.huimv.environ.eco.entity.feedVo.FeedConsumeChartVo">
-        SELECT ROUND(SUM(reality) / 1000, 2) AS totalConsume FROM `feed_consume` WHERE DATE BETWEEN '${startDate}' AND '${endDate}'
+        SELECT ROUND(SUM(reality), 2) AS totalConsume FROM `feed_consume` WHERE DATE BETWEEN '${startDate}' AND '${endDate}'
     </select>
     <select id="list" resultType="com.huimv.environ.eco.entity.feedVo.FeedFormVo">
-        SELECT DATE AS 'date',ROUND(SUM(reality) / 1000, 2) AS consume FROM `feed_consume` WHERE DATE BETWEEN '${startDate}' AND '${endDate}'
+        SELECT DATE AS 'date',ROUND(SUM(reality), 2) AS consume FROM `feed_consume` WHERE DATE BETWEEN '${startDate}' AND '${endDate}'
         GROUP BY DATE(DATE)
         ORDER BY DATE
     </select>