料塔余量修改5

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

@@ -233,13 +233,32 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
 
     @Override
     public FeedingFatMoveVo listFatMove(FeedingFatMoveParam fatMoveParam) {
+
         Date timesmorning = DataUill.getTimesmorning();
         QueryWrapper<FeedingFat> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", fatMoveParam.getOrgId());
         //全场
         FeedingFatMoveVo feedingFatMoveVo = fatMapper.listFatMove(queryWrapper);
-        List<FeedingListVo> feedingListVos = feedingListMapper.listFeed(new QueryWrapper<FeedingList>()
-                .eq("org_id", fatMoveParam.getOrgId()));
+
+        QueryWrapper<FeedingEnv> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("org_id", fatMoveParam.getOrgId());
+        List<FeedingListVo> feedingListVos = new ArrayList<>();
+        List<FeedingEnv> feedingEnvs = envMapper.selectList(queryWrapper2);
+        for (FeedingEnv feedingEnv : feedingEnvs) {
+            QueryWrapper<FeedingList> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("org_id", fatMoveParam.getOrgId()).eq("unit_id",feedingEnv.getUnitId())
+                    .orderByDesc("upload_time").last(" limit 1");
+            FeedingList one = feedingListMapper.selectOne(queryWrapper1);
+            FeedingListVo vo = new FeedingListVo();
+            vo.setUnitId(feedingEnv.getUnitId());
+            vo.setUnitName(feedingEnv.getUnitName());
+            if (ObjectUtil.isNotEmpty(one)) {
+                vo.setValue(one.getMarginValue());
+            } else {
+                vo.setValue("0");
+            }
+            feedingListVos.add(vo);
+        }
         feedingFatMoveVo.setFeedingName(feedingListVos);
         JSONArray jsonArray = new JSONArray();
         for (FeedingListVo feedingListVo : feedingListVos) {
@@ -270,7 +289,7 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
         FeedingFatMoveVo2 vo2 = new FeedingFatMoveVo2();
         QueryWrapper<FeedingFat> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", fatMove2Param.getOrgId()).in("unit_id", idList)
-                .ge("create_time", timesmorning);
+                .ge("upload_time", timesmorning);
         if ("1".equals(fatMove2Param.getType())) {
             FeedingFatMoveVo feedingFatMoveVo = fatMapper.listFatMove(queryWrapper);//今日采食和饮水
             List<FeedingFatVo2> list = fatMapper.listFeeding(queryWrapper);//采食
@@ -287,7 +306,7 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
             Date monthmorning = DataUill.getTimesMonthmorning();
             QueryWrapper<FeedingFat> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("org_id", fatMove2Param.getOrgId()).in("unit_id", idList)
-                    .ge("create_time", monthmorning);
+                    .ge("upload_time", monthmorning);
             List<FeedingFatVo2> list = fatMapper.listMonthFeeding(queryWrapper1);
             List<FeedingFatVo2> list1 = fatMapper.listMonthWater(queryWrapper1);
             List<FeedingFatVo2> list2 = fatMapper.listMonthweigth(queryWrapper1);