接受数据修改6

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

@@ -393,7 +393,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
 
             QueryWrapper<EnvRegularCallFeeding> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("chi_num", baseDuckInfo.getChiNum()).
-                    between(StringUtils.isNotBlank(startTime), "call_date", startTime, endTime);
+                    between(StringUtils.isNotBlank(startTime), "call_date",startTime+" 00:00:00", endTime+" 23:59:59");
             List<EnvRegularCallFeeding> feedings = feedingMapper.selectList(queryWrapper2);//采食
             double count = 0;
             for (EnvRegularCallFeeding feeding : feedings) {
@@ -401,7 +401,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             }
             QueryWrapper<EnvRegularCallEgg> queryWrapper3 = new QueryWrapper<>();
             queryWrapper3.eq("chi_num", baseDuckInfo.getChiNum()).
-                    between(StringUtils.isNotBlank(startTime), "call_date", startTime, endTime);
+                    between(StringUtils.isNotBlank(startTime), "call_date", startTime+" 00:00:00", endTime+" 23:59:59");
             List<EnvRegularCallEgg> eggs = eggMapper.selectList(queryWrapper3);//产蛋
             double count1 = 0;
             Integer eggNum = 0;

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

@@ -48,7 +48,7 @@
 INNER JOIN
 (select max(call_date) da FROM `env_move_call` where chi_num='${chiNum}'
 <if test="startTime!=null and startTime!=''">
-        and call_date between '${startTime}' and '${endTime}'
+        and call_date between '${startTime} 00:00:00'  and '${endTime} 23:59:59'
 </if>
 GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d'))
 AS b ON a.call_date=b.da