查询

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

@@ -72,6 +72,11 @@ public class EnvRegularCallEggController {
     public Result listSeven(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return eggService.listSeven(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/listAll")
+    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return eggService.listAll(httpServletRequest, paramsMap);
+    }
     @RequestMapping("/getEggNumById")
     public Result getEggNumById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return eggService.getEggNumById(httpServletRequest, paramsMap);

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

@@ -27,4 +27,6 @@ public interface EnvRegularCallEggMapper extends BaseMapper<EnvRegularCallEgg> {
     List<EnvRegularCallEgg> printEggList(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallEgg> queryWrapper);
 
     String getTotalEgg (String farmId);
+
+    IPage<EnvRegularCallEgg> listAll(Page<EnvRegularCallEgg> page,@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallEgg> queryWrapper);
 }

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

@@ -45,4 +45,5 @@ public interface IEnvRegularCallEggService extends IService<EnvRegularCallEgg> {
     Result collectorEnv(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
 
+    Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -196,8 +196,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId).orderByDesc("call_date")
-        /* .ge("call_date", calendar.getTime())*/;
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId);
         QueryWrapper<EnvRegularCallEgg> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId);
         queryWrapper1.select(" IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum,chi_num chiNum");
@@ -326,4 +325,16 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         return new Result(ResultCode.SUCCESS, jsonObject);
     }
 
+    @Override
+    public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String duckId = paramsMap.get("id");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId);
+        Page<EnvRegularCallEgg> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, eggMapper.listAll(page, queryWrapper));
+    }
+
 }

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

@@ -20,6 +20,7 @@
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
         ORDER BY call_date ASC
+        LIMIT 20
     </select>
 
     <select id="listPage" resultType="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
@@ -29,6 +30,13 @@
         ORDER BY call_date ASC
     </select>
 
+    <select id="listAll" resultType="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
+        SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',(IFNUll(sum(duck_weight),'0')) 'duckWeight',call_date 'callDate',duck_num duckNum,chi_num chiNum  FROM `env_regular_call_egg`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
+        ORDER BY call_date DESC
+    </select>
+
     <select id="printEggList" resultType="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
         SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',(IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_num 'duckNum',call_date 'callDate' FROM `env_regular_call_egg`
          ${ew.customSqlSegment}