22

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

@@ -71,23 +71,40 @@ public class BreedController {
         String femaleNum = breed.getFemaleNum();//雌鸭
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", breed.getFarmId()).eq("duck_num", maleNum);
-        BaseDuckInfo duckInfo = duckInfoService.getOne(queryWrapper);
+        BaseDuckInfo duckInfo = duckInfoService.getOne(queryWrapper);//雄鸭
+
         QueryWrapper<BaseDuckInfo> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", breed.getFarmId()).eq("duck_num", maleNum);
-        BaseDuckInfo duckInfo1 = duckInfoService.getOne(queryWrapper1);
+        queryWrapper1.eq("farm_id", breed.getFarmId()).eq("duck_num", femaleNum);
+        BaseDuckInfo duckInfo1 = duckInfoService.getOne(queryWrapper1);//雌鸭
+
+
+
         if (ObjectUtil.isNotEmpty(duckInfo)) {
             if (duckInfo.getDuckSex() == 0) {
                 breed.setMaleNum(maleNum);
             } else {
                 return new Result(10001, "雌鸭编号不能填入雄鸭配种中！", false);
             }
+            if (duckInfo.getDayAge() < 100) {
+                return new Result(10001, "父亲（或母亲）鸭只日龄小于100天！", false);
+            }
+        }else {
+            return new Result(10001, "无此编号雄鸭！", false);
         }
+
         if (ObjectUtil.isNotEmpty(duckInfo1)) {
-            if (duckInfo.getDuckSex() == 0) {
+            if (duckInfo1.getDuckSex() == 0) {
                 breed.setFemaleNum(femaleNum);
             } else {
                 return new Result(10001, "雄鸭编号不能填入雌鸭配种中！", false);
             }
+
+            if (duckInfo1.getDayAge() < 100) {
+
+                return new Result(10001, "父亲（或母亲）鸭只日龄小于100天！", false);
+            }
+        } else {
+            return new Result(10001, "无此编号雌鸭！", false);
         }
 
         breedService.save(breed);

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

@@ -57,7 +57,7 @@ public class DepartureController {
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", departure.getFarmId()).eq("duck_num", duckNum);
         BaseDuckInfo infoServiceOne = infoService.getOne(queryWrapper);
-        infoServiceOne.setIsCage(0);
+        infoServiceOne.setIsCage(1);
         infoService.updateById(infoServiceOne);
         return new Result(10000, "添加成功！", true);
     }

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

@@ -124,27 +124,35 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                 return new Result(10001, "鸭只编号、父亲编号、母亲编号三者的编号不能相同！", false);
             }
             QueryWrapper<BaseDuckInfo> duckInfoQueryWrapper = new QueryWrapper<>();
-            duckInfoQueryWrapper.eq("farm_id", paramsMap.get("farmId")).eq("duck_num", fatherNum).eq("is_cage",0);
+            duckInfoQueryWrapper.eq("farm_id", paramsMap.get("farmId")).eq("duck_num", fatherNum).eq("is_cage", 0);
             BaseDuckInfo father = duckInfoMapper.selectOne(duckInfoQueryWrapper);//父亲编号
 
             if (ObjectUtil.isEmpty(father)) {
                 return new Result(10001, "父亲编号不存在，请重新输入！", false);
             } else {
-
+                if (father.getDuckSex() == 1) {
+                    return new Result(10001, "该编号为母亲编号，请重新填写！", false);
+                }
                 if (father.getDayAge() < 100) {
                     return new Result(10001, "父亲（或母亲）鸭只日龄小于100天", false);
                 } else {
                     QueryWrapper<BaseDuckInfo> duckInfoQueryWrapper1 = new QueryWrapper<>();
-                    duckInfoQueryWrapper1.eq("farm_id", paramsMap.get("farmId")).eq("duck_num", motherNum).eq("is_cage",0);
+                    duckInfoQueryWrapper1.eq("farm_id", paramsMap.get("farmId")).eq("duck_num", motherNum).eq("is_cage", 0);
                     BaseDuckInfo mother = duckInfoMapper.selectOne(duckInfoQueryWrapper1);//母亲编号
                     if (ObjectUtil.isEmpty(mother)) {
                         return new Result(10001, "母亲编号不存在，请重新输入！", false);
                     } else {
+                        if (mother.getDuckSex() == 0) {
+                            return new Result(10001, "该编号为父亲编号，请重新填写！", false);
+                        }
+
                         if (mother.getDayAge() < 100) {
                             return new Result(10001, "父亲（或母亲）鸭只日龄小于100天！", false);
                         } else {
                             baseDuckInfo.setFatherNum(paramsMap.get("fatherNum"));
                             baseDuckInfo.setMotherNum(paramsMap.get("motherNum"));
+                            baseDuckInfo.setFatherGenotype(father.getGenotype());
+                            baseDuckInfo.setMotherGenotype(mother.getGenotype());
                         }
                     }
                 }
@@ -157,8 +165,6 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         if (StringUtils.isBlank(motherNum) && StringUtils.isNotBlank(fatherNum)) {
             return new Result(10001, "父亲编号已填写，请输入母亲编号！", false);
         }
-        baseDuckInfo.setFatherGenotype(paramsMap.get("fatherGenotype"));
-        baseDuckInfo.setMotherGenotype(paramsMap.get("motherGenotype"));
         baseDuckInfo.setSpecialNeeds(paramsMap.get("specialNeeds"));
         baseDuckInfo.setIsCage(0);
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
@@ -234,25 +240,34 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                 return new Result(10001, "鸭只编号、父亲编号、母亲编号三者的编号不能相同！", false);
             }
             QueryWrapper<BaseDuckInfo> duckInfoQueryWrapper = new QueryWrapper<>();
-            duckInfoQueryWrapper.eq("farm_id", baseDuckInfo.getFarmId()).eq("duck_num", fatherNum).eq("is_cage",0);
+            duckInfoQueryWrapper.eq("farm_id", baseDuckInfo.getFarmId()).eq("duck_num", fatherNum).eq("is_cage", 0);
             BaseDuckInfo father = duckInfoMapper.selectOne(duckInfoQueryWrapper);//父亲编号
 
             if (ObjectUtil.isEmpty(father)) {
                 return new Result(10001, "父亲编号不存在，请重新输入！", false);
             } else {
+                if (father.getDuckSex() == 1) {
+                    return new Result(10001, "该编号为母亲编号，请重新填写！", false);
+                }
 
                 if (father.getDayAge() < 100) {
                     return new Result(10001, "父亲（或母亲）鸭只日龄小于100天", false);
                 } else {
                     QueryWrapper<BaseDuckInfo> duckInfoQueryWrapper1 = new QueryWrapper<>();
-                    duckInfoQueryWrapper1.eq("farm_id",  baseDuckInfo.getFarmId()).eq("duck_num", motherNum).eq("is_cage",0);
+                    duckInfoQueryWrapper1.eq("farm_id", baseDuckInfo.getFarmId()).eq("duck_num", motherNum).eq("is_cage", 0);
                     BaseDuckInfo mother = duckInfoMapper.selectOne(duckInfoQueryWrapper1);//母亲编号
                     if (ObjectUtil.isEmpty(mother)) {
                         return new Result(10001, "母亲编号不存在，请重新输入！", false);
                     } else {
+                        if (mother.getDuckSex() == 0) {
+                            return new Result(10001, "该编号为父亲编号，请重新填写！", false);
+                        }
+
                         if (mother.getDayAge() < 100) {
                             return new Result(10001, "父亲（或母亲）鸭只日龄小于100天！", false);
                         }
+                        baseDuckInfo.setFatherGenotype(father.getGenotype());
+                        baseDuckInfo.setMotherGenotype(mother.getGenotype());
                     }
                 }
             }

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

@@ -1,5 +1,7 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -70,9 +72,8 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
                 queryWrapper.ge("call_date", timesmorning);
 
             } else if ("2".equals(dateType)) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-                queryWrapper.ge("call_date", calendar.getTime());
+                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                queryWrapper.ge("call_date", dateTime);
 
             } else if ("3".equals(dateType)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/Print.java

@@ -75,10 +75,10 @@ public class Print {
         String s2 = "";
         //健康状况
         for (DuckHealthInfo healthInfo : healthInfos) {
-            if ("".equals(healthInfo.getHealthResult()) || null == healthInfo.getHealthResult()) {
+            if ("".equals(healthInfo.getDiseaseName()) || null == healthInfo.getDiseaseName()) {
                 s1 = sdf.format(healthInfo.getHealthDate()) + "无" + ";" + "\n" + s1;
             } else {
-                s1 = sdf.format(healthInfo.getHealthDate()) + healthInfo.getHealthResult() + ";" + "\n" + s1;
+                s1 = sdf.format(healthInfo.getHealthDate()) +" "+healthInfo.getDiseaseName() + ";" + "\n" + s1;
             }
         }
         //日龄体重
@@ -93,9 +93,9 @@ public class Print {
         //免疫记录
         for (DuckImmunityInfo immunityInfo : immunityInfos) {
             if (("").equals(immunityInfo.getVaccination()) || null == immunityInfo.getVaccination()) {
-                s2 = sdf.format(immunityInfo.getHealthDate()) + "无" + ";" + "\n" + s2;
+                s2 = sdf.format(immunityInfo.getHealthDate()) + "  无;" + "\n" + s2;
             } else {
-                s2 = sdf.format(immunityInfo.getHealthDate()) + immunityInfo.getVaccination() + ";" + "\n" + s2;
+                s2 = sdf.format(immunityInfo.getHealthDate()) +" "+ immunityInfo.getVaccination() + ";" + "\n" + s2;
             }
 
         }