打印

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

@@ -32,5 +32,5 @@ public interface EnvRegularCallEggMapper extends BaseMapper<EnvRegularCallEgg> {
 
     IPage<EnvRegularCallEgg> listAll(Page<EnvRegularCallEgg> page,@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallEgg> queryWrapper);
 
-    EggVo print(String duckNum, Date startDate, Date endDate);
+    EggVo print(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallEgg> queryWrapper1);
 }

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

@@ -418,11 +418,11 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             }
             printEntrty.setBaseDuckInfo(baseDuckInfo);
             printEntrty.setFeeding(def.format(count));
-            Date endDate = new SimpleDateFormat("yyyy-MM-dd").parse(endTime);
-            Date startDate = new SimpleDateFormat("yyyy-MM-dd").parse(startTime);
+            Date endDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime+" 23:59:59");
+            Date startDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime + " 00:00:00");
             System.out.println("开始时间:" + startDate);
             System.out.println("结束时间:" + endDate);
-            System.out.println("满足日龄日期:" + dateTime);
+            System.out.println("满足日龄日期:" + resultDate);
             if (ObjectUtil.isNotEmpty(resultDate)){
                 if (resultDate.after(endDate)){
                     System.out.println("满足日龄在结束日期之后");
@@ -430,13 +430,17 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                     printEntrty.setEgging("0");
                     printEntrty.setAvgWeiht("0");
                 }else {
+                    QueryWrapper<EnvRegularCallEgg> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper.eq("duck_num",baseDuckInfo.getDuckNum());
                     EggVo eggVo = new EggVo();
                     if (resultDate.before(startDate)){
+                        queryWrapper1.between("call_date",startDate,endDate);
                         System.out.println("满足日龄在开始日期之前");
-                        eggVo = eggMapper.print(baseDuckInfo.getDuckNum(),startDate,endDate);
+                        eggVo = eggMapper.print(queryWrapper1);
                     }else {
+                        queryWrapper1.between("call_date",resultDate,endDate);
                         System.out.println("满足日龄在开始日期之后");
-                        eggVo = eggMapper.print(baseDuckInfo.getDuckNum(),resultDate,endDate);
+                        eggVo = eggMapper.print(queryWrapper1);
                     }
                     printEntrty.setEggNum(eggVo.getTotalEgg());
                     printEntrty.setEgging(eggVo.getTotalWeight());

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

@@ -48,6 +48,6 @@
     </select>
     <select id="print" resultType="com.huimv.guowei.admin.entity.vo.EggVo">
         select sum(egg_num) as totalEgg,sum(duck_weight) as totalWeight,Round((SUM(duck_weight)/SUM(egg_num)),2) as 'avgWeight' from `env_regular_call_egg`
-        where duck_num = #{duckNum}  AND call_date between ${startDate} and ${endDate}
+        ${ew.customSqlSegment}
     </select>
 </mapper>