精准饲喂移动端接口修改2

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/service/impl/FeedingFatServiceImpl.java

@@ -118,9 +118,13 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
         Integer pageNum = feedingFatPageParam.getCurrent();
         Integer pageSize = feedingFatPageParam.getSize();
         String eartagNum = feedingFatPageParam.getEartagNum();
+        String startDate = feedingFatPageParam.getStartDate();
+        String endDate = feedingFatPageParam.getEndDate();
         QueryWrapper<FeedingFat> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", orgId)
-                .eq(StringUtils.isNotBlank(eartagNum), "eartag_num", eartagNum);
+                .like(StringUtils.isNotBlank(eartagNum), "eartag_num", eartagNum)
+                .or().like(StringUtils.isNotBlank(eartagNum), "device_code", eartagNum)
+                .between(StringUtils.isNotBlank(startDate), "create_time", startDate, endDate);
         Page<FeedingFat> page = new Page<>(pageNum, pageSize);
         IPage<FeedingFatVo> fatVoIPage = fatMapper.listFeedPage(page, queryWrapper);
         return fatVoIPage;