精准饲喂母猪修改6

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

@@ -15,10 +15,10 @@
 
     <select id="listPage" resultType="vip.xiaonuo.modular.feed.feedingfat.vo.FeedingFatVo">
     select
-    create_time createDate,eartag_num eartagNum,device_code deviceCode,
-    CONVERT(IFNULL(SUM(CASE WHEN  DATE(create_date) =CURRENT_DATE THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS todayFeed,
-    CONVERT(IFNULL(SUM(CASE WHEN  DATE(create_date) =CURRENT_DATE THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS todayWater,
-    CONVERT(IFNULL(SUM(CASE WHEN  DATE(create_date) =CURRENT_DATE THEN weigth_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS dayWeight,
+    create_time createDate,eartag_num eartagNum,device_code deviceCode,day_num dayNum,unit_name unitName
+    CONVERT(IFNULL(SUM(CASE WHEN  DATE(create_time) =CURRENT_DATE THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS todayFeed,
+    CONVERT(IFNULL(SUM(CASE WHEN  DATE(create_time) =CURRENT_DATE THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS todayWater,
+    CONVERT(IFNULL(SUM(CASE WHEN  DATE(create_time) =CURRENT_DATE THEN weigth_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS dayWeight,
  -- 昨日用量
     CONVERT(IFNULL(SUM(CASE WHEN create_time=DATE_SUB(CURDATE(),INTERVAL 1 DAY) THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS yesterdayWater,
     CONVERT(IFNULL(SUM(CASE WHEN create_time=DATE_SUB(CURDATE(),INTERVAL 1 DAY) THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS yesterdayFeed

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/vo/FeedingFatVo.java

@@ -37,4 +37,10 @@ public class FeedingFatVo {
 
     @ApiModelProperty(value = "设备编号")
     private String deviceCode;
+
+    @ApiModelProperty(value = "日龄")
+    private String dayNum;
+
+    @ApiModelProperty(value = "安装位置")
+    private String unitName;
 }