大屏弹窗修改1

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/BaseDuckInfoVo.java

@@ -121,6 +121,7 @@ public class BaseDuckInfoVo implements Serializable {
 
     private String unitList;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date outTime;
 
     private Integer eggNum;

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.guowei.admin.common.utils.DataUill;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.common.utils.UploadImage;
@@ -245,12 +246,13 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             baseDuckInfoVo.setEggNum(egg.getEggNum());
         }
 
+        Date timesmorning = DataUill.getTimesmorning();
         QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum);
-        List<EnvRegularCallFeeding> feedings = feedingMapper.selectList(queryWrapper1);
+        queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum).ge("call_date",timesmorning);
+        List<EnvRegularCallFeeding> feedings = feedingMapper.listDay(queryWrapper1);
         List<String> list = new ArrayList<>();
         for (EnvRegularCallFeeding feeding : feedings) {
-            String s = feeding.getDuckNum() + "号鸭进食" + feeding.getDuckWeight() + "kg,";
+            String s = feeding.getDuckNum() + "号鸭进食" + feeding.getDuckWeight() + "g,";
             list.add(s);
         }
         JSONObject jsonObject = new JSONObject();