Merge remote-tracking branch 'origin/master'

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.java

@@ -1,5 +1,6 @@
 package com.huimv.guowei.admin.mapper;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -41,7 +42,7 @@ public interface EnvRegularCallFeedingMapper extends BaseMapper<EnvRegularCallFe
 
     List<EnvRegularCallFeeding> listDayDesc(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
 
-    List<EnvRegularCallEggVo> listCount(String duckNum);
+    List<EnvRegularCallEggVo> listCount(String duckNum, Date resultDate);
 
     IPage<EnvRegularCallFeeding> listSelect(Page<EnvRegularCallFeeding> page, Date date,String farmId);
     IPage<EnvRegularCallFeeding> listSelect1(Page<EnvRegularCallFeeding> page, Date date,String farmId,String num);

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

@@ -1,5 +1,7 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -23,10 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -149,7 +148,24 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
     @Override
     public void printEgg(HttpServletResponse response, Map<String, String> paramsMap) throws Exception {
         String duckCode = paramsMap.get("duckCode");
-        List<EnvRegularCallEggVo> envRegularCallEggVos = feedingMapper.listCount(duckCode);
+        Date duckBirthday = infoMapper.selectOne(new QueryWrapper<BaseDuckInfo>().lambda().eq(BaseDuckInfo::getDuckNum, duckCode)).getDuckBirthday();
+        DateTime dateTime = DateUtil.offsetDay(duckBirthday, 298);
+        List<EnvRegularCallEggVo> envRegularCallEggVos = new ArrayList<>();
+        int totalEgg = 0;
+        Date resultDate = null;
+        List<EnvRegularCallEgg> envRegularCallEggs = eggMapper.selectList(new QueryWrapper<EnvRegularCallEgg>().lambda()
+                .ge(EnvRegularCallEgg::getCallDate, dateTime));
+        if (ObjectUtil.isNotEmpty(envRegularCallEggs)){
+            for (EnvRegularCallEgg envRegularCallEgg : envRegularCallEggs) {
+                totalEgg += envRegularCallEgg.getEggNum();
+                if (totalEgg > 3){
+                    resultDate = envRegularCallEgg.getCallDate();
+                }
+            }
+        }
+        if (ObjectUtil.isNotEmpty(resultDate)){
+            envRegularCallEggVos = feedingMapper.listCount(duckCode,resultDate);
+        }
         Print.printEgg(envRegularCallEggVos);
     }
 

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

@@ -113,7 +113,7 @@ FROM (
 LEFT JOIN (
     SELECT IFNULL(SUM(egg_num), 0) AS eggNum, IFNULL(SUM(duck_weight), 0) AS eggWeight, DATE_FORMAT(call_date, "%Y-%m-%d") AS call_date
     FROM `env_regular_call_egg`
-    WHERE duck_num = #{duckNum}
+    WHERE duck_num = #{duckNum} and call_date >= #{resultDate}
     GROUP BY DATE_FORMAT(call_date, "%Y-%m-%d")
 ) t2
 ON DATE_FORMAT(t1.call_date,"%Y-%m-%d") = DATE_FORMAT(t2.call_date,"%Y-%m-%d")