孵化登记

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

@@ -42,6 +42,11 @@ public class BaseDuckInfoController {
         return duckInfoService.listDuck(httpServletRequest, paramsMap);
     }
 
+    @RequestMapping("/listAppDuck")
+    public Result listAppDuck(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return duckInfoService.listAppDuck(httpServletRequest, paramsMap);
+    }
+
     @RequestMapping("/deleteDuck")
     public Result deleteDuck(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         duckInfoService.removeById(paramsMap.get("id"));

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

@@ -47,6 +47,15 @@ public class DuckIncubateInfoController {
         if (layEggsTime.compareTo(incubateTime) > 0){
             return new Result(10001,"孵化日期不能早于产蛋日期!",false);
         }
+        if (duckIncubateInfo.getFertilizedNum()>duckIncubateInfo.getLayEggsNum()){
+            return new Result(10001,"受精蛋数应小于产蛋数!",false);
+        }
+        if (duckIncubateInfo.getIncubateNum()>duckIncubateInfo.getFertilizedNum()){
+            return new Result(10001,"孵化数应小于受精蛋数!",false);
+        }
+        if (duckIncubateInfo.getHealthyDuckNum() > duckIncubateInfo.getIncubateNum()){
+            return new Result(10001,"健雏数应小于孵化数!",false);
+        }
         duckIncubateInfoService.save(duckIncubateInfo);
         return Result.SUCCESS();
     }

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

@@ -36,4 +36,6 @@ public interface IBaseDuckInfoService extends IService<BaseDuckInfo> {
     Result listDuckByScreen(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
     Result listDuckByScreen2(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    Result listAppDuck(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -579,5 +579,25 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
 
     }
 
+    @Override
+    public Result listAppDuck(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String chiNum = paramsMap.get("chiNum");
+        String jiaoNum = paramsMap.get("jiaoNum");
+        String farmId = paramsMap.get("farmId");//场的编码
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if (pageNum == null || "".equals(pageNum)) {
+            pageNum = "1";
+        }
+        if (pageSize == null || "".equals(pageSize)) {
+            pageSize = "10";
+        }
+        QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(chiNum), "chi_num", chiNum)
+                .like(StringUtils.isNotBlank(jiaoNum), "jiao_num", jiaoNum).eq("farm_id", farmId).orderByDesc("id");
+        Page<BaseDuckInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, duckInfoMapper.selectPage(page, queryWrapper));
+    }
+
 
 }