查询

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvRegularCallFeedingController.java

@@ -46,6 +46,11 @@ public class EnvRegularCallFeedingController {
         return feedingService.listSeven(httpServletRequest, paramsMap);
     }
 
+    @RequestMapping("/listAll")
+    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return feedingService.listAll(httpServletRequest, paramsMap);
+    }
+
     @PostMapping("/getScreenFeed")
     public Result getScreenFeed(@RequestBody Map<String, String> paramsMap){
         return feedingService.getScreenFeed(paramsMap);

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

@@ -49,4 +49,6 @@ public interface EnvRegularCallFeedingMapper extends BaseMapper<EnvRegularCallFe
     String listScreen3(QueryWrapper<Object> objectQueryWrapper);
 
     FeedingVo FeedTime(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
+
+    IPage<EnvRegularCallFeeding> listAll(Page<EnvRegularCallFeeding> page,@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallFeedingService.java

@@ -28,4 +28,6 @@ public interface IEnvRegularCallFeedingService extends IService<EnvRegularCallFe
     Result getScreenFeed(Map<String, String> paramsMap);
 
     Result listScreenFeed(Map<String, String> paramsMap);
+
+    Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -239,4 +239,18 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         return new Result(ResultCode.SUCCESS, envRegularCallFeedingList);
     }
 
+    @Override
+    public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String duckId = paramsMap.get("id");
+        String pageSize = paramsMap.get("pageSize");
+        String pageNum = paramsMap.get("pageNum");
+
+        QueryWrapper<EnvRegularCallFeeding> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("event_type", 0)
+                .eq(StringUtils.isNotBlank(duckId), "duck_id", duckId);
+        Page<EnvRegularCallFeeding> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, feedingMapper.listAll(page, queryWrapper));
+    }
+
 }

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

@@ -148,4 +148,10 @@ ORDER BY b.callDate DESC
         SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight'FROM `env_regular_call_feeding`
          ${ew.customSqlSegment}
     </select>
+    <select id="listAll" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
+        SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',call_date 'callDate',chi_num 'chiNum' FROM `env_regular_call_feeding`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
+        ORDER BY call_date DESC
+    </select>
 </mapper>