报表

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

@@ -1,5 +1,6 @@
 package com.huimv.environ.eco.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.common.utils.Result;
@@ -16,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -42,9 +44,15 @@ public class FeedEggDetailServiceImpl extends ServiceImpl<FeedEggDetailMapper, F
         Page<FeedEggVo> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         Page<FeedEggVo> layEggVoPage = feedEggDetailMapper.page(page,startDate,endDate);
         List<FeedEggVo> records = layEggVoPage.getRecords();
-        for (FeedEggVo record : records) {
-            List<FeedEggDetail> feedEggDetails = feedEggDetailMapper.selectList(new QueryWrapper<FeedEggDetail>().lambda().eq(FeedEggDetail::getDate, record.getDate()).orderByAsc(FeedEggDetail::getUnitName));
-            record.setList(feedEggDetails);
+        Iterator<FeedEggVo> iterator = records.iterator();
+        while (iterator.hasNext()){
+            FeedEggVo feedEggVo = iterator.next();
+            List<FeedEggDetail> feedEggDetails = feedEggDetailMapper.selectList(new QueryWrapper<FeedEggDetail>().lambda().eq(FeedEggDetail::getDate, feedEggVo.getDate()).orderByAsc(FeedEggDetail::getUnitName));
+            if (ObjectUtil.isNotEmpty(feedEggDetails)){
+                feedEggVo.setList(feedEggDetails);
+            }else {
+                iterator.remove();
+            }
         }
         return new Result(ResultCode.SUCCESS,layEggVoPage);
     }