报表

huimv-farm-datacenter-egg/huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/FeedEggDetailServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.admin.system.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -39,15 +40,10 @@ public class FeedEggDetailServiceImpl extends ServiceImpl<FeedEggDetailMapper, F
         String endDate = map.get("endDate");
         List<FeedEggVo> feedEggVos = feedEggDetailMapper.listPrint(startDate,endDate);
         for (FeedEggVo feedEggVo : feedEggVos) {
-            BigDecimal totalEggWeight = feedEggVo.getTotalEggWeight();
-            BigDecimal totalFeedConsume = feedEggVo.getTotalFeedConsume();
-            BigDecimal rate = BigDecimal.ZERO;
-            if (totalEggWeight.compareTo(BigDecimal.ZERO) != 0){
-                rate = totalFeedConsume.divide(totalEggWeight,2, RoundingMode.HALF_UP);
-            }
-            feedEggVo.setTotalFeedEggRate(rate);
             List<FeedEggDetail> feedEggDetails = feedEggDetailMapper.selectList(new QueryWrapper<FeedEggDetail>().lambda().eq(FeedEggDetail::getDate, feedEggVo.getDate()).orderByAsc(FeedEggDetail::getUnitName));
-            feedEggVo.setList(feedEggDetails);
+            if (ObjectUtil.isNotEmpty(feedEggDetails)){
+                feedEggVo.setList(feedEggDetails);
+            }
         }
         Print.printFeedEgg(feedEggVos);
     }

huimv-farm-datacenter-egg/huimv-farm-admin/src/main/java/com/huimv/admin/system/util/Print.java

@@ -28,7 +28,7 @@ public class Print {
             feedEggPrintVo.setDate(feedEggVo.getDate());
             feedEggPrintVo.setTotalEggWeight(feedEggVo.getTotalEggWeight() + "吨");
             feedEggPrintVo.setTotalFeedConsume(feedEggVo.getTotalFeedConsume() + "吨");
-            feedEggPrintVo.setTotalFeedEggRate(feedEggVo.getTotalFeedEggRate().toString());
+            feedEggPrintVo.setTotalFeedEggRate(feedEggVo.getTotalFeedEggRate().toString()+"g:1");
 
             List<FeedEggDetail> list1 = feedEggVo.getList();
             feedEggPrintVo.setStock1(list1.get(0).getStock());

huimv-farm-datacenter-egg/huimv-farm-admin/src/main/resources/com/huimv/admin/system/mapper/FeedEggDetailMapper.xml

@@ -10,7 +10,13 @@
         SELECT
             e.date,
             e.total_egg_weight AS 'totalEggWeight',
-            COALESCE(ROUND(u.total_feed_consume / 1000, 2), 0) AS 'totalFeedConsume'
+            COALESCE(ROUND(u.total_feed_consume / 1000, 2), 0) AS 'totalFeedConsume',
+            ROUND(
+                CASE
+                WHEN e.egg_production IS NULL OR e.egg_production = 0 THEN 0
+                ELSE COALESCE(u.total_feed_consume, 0) * 1000 / e.egg_production
+                END, 2
+            ) AS 'totalFeedEggRate'
         FROM
             (SELECT
                 DATE AS DATE,