Newspaper 1 рік тому
батько
коміт
b03ccf720c

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

@@ -536,14 +536,11 @@ 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)*/;
+        queryWrapper1.eq("farm_id", farmId).ne("duck_weight",0.0).eq("duck_num", duckNum)/*.ge("call_date",timesmorning)*/;
         List<EnvRegularCallFeeding> feedings = feedingMapper.listDayDesc(queryWrapper1);
         JSONArray jsonArray = new JSONArray();
         for (EnvRegularCallFeeding feeding : feedings) {
-            String s ="";
-            if (feeding.getDuckWeight() > 0){
-                s = feeding.getChiNum() + "翅号鸭进食" + feeding.getDuckWeight() + "g,";
-            }
+            String s = feeding.getChiNum() + "翅号鸭进食" + feeding.getDuckWeight() + "g,";
             Date callDate = feeding.getCallDate();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             String s1 = sdf.format(callDate);