添加档案修改

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

@@ -57,25 +57,25 @@ public class BaseDuckInfoController {
     @PostMapping("/addDuck")
     public Result addDuck(HttpServletRequest httpServletRequest, @RequestParam(name = "imgUrl", required = false) MultipartFile imgUrl,
                           @RequestParam(name = "farmId") String farmId,
-                          @RequestParam(name = "unitList") String unitList,
-                          @RequestParam(name = "unitName") String unitName,
+                          @RequestParam(name = "unitList",required = false) String unitList,
+                          @RequestParam(name = "unitName",required = false) String unitName,
                           @RequestParam(name = "duckBreed") String duckBreed,
-                          @RequestParam(name = "duckSex") String duckSex,
+                          @RequestParam(name = "duckSex",required = false) String duckSex,
                           @RequestParam(name = "duckBirthPlace") String duckBirthPlace,
                           @RequestParam(name = "duckBirthDay") String duckBirthDay,
                           @RequestParam(name = "genotype") String genotype,
                           @RequestParam(name = "nowWeight") String nowWeight,
-                          @RequestParam(name = "unitId") String unitId,
-                          @RequestParam(name = "breedEnv") String breedEnv,
+                          @RequestParam(name = "unitId",required = false) String unitId,
+                          @RequestParam(name = "breedEnv",required = false) String breedEnv,
                           @RequestParam(name = "hatchRate", required = false) String hatchRate,
                           @RequestParam(name = "fatherNum", required = false) String fatherNum,
                           @RequestParam(name = "motherNum", required = false) String motherNum,
                           @RequestParam(name = "fatherGenotype") String fatherGenotype,
                           @RequestParam(name = "motherGenotype") String motherGenotype,
-                          @RequestParam(name = "specialNeeds") String specialNeeds,
+                          @RequestParam(name = "specialNeeds",required = false) String specialNeeds,
                           @RequestParam(name = "batchNum") String batchNum,
                           @RequestParam(name = "chiNum") String chiNum,
-                          @RequestParam(name = "jiaoNum") String jiaoNum,
+                          @RequestParam(name = "jiaoNum",required = false) String jiaoNum,
                           @RequestParam(name = "fatherChiNum",required = false) String fatherChiNum,
                           @RequestParam(name = "fatherJiaoNum",required = false) String fatherJiaoNum,
                           @RequestParam(name = "motherChiNum",required = false) String motherChiNum,

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

@@ -111,12 +111,22 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         }
         baseDuckInfo.setBatchNum(paramsMap.get("batchNum"));
         baseDuckInfo.setChiNum(paramsMap.get("chiNum"));
-        baseDuckInfo.setJiaoNum(paramsMap.get("jiaoNum"));
-        baseDuckInfo.setUnitList(paramsMap.get("unitList"));
-        baseDuckInfo.setUnitName(paramsMap.get("unitName"));
+        if (StringUtils.isNotBlank(paramsMap.get("jiaoNum"))) {
+            baseDuckInfo.setJiaoNum(paramsMap.get("jiaoNum"));
+        }
+        if (StringUtils.isNotBlank(paramsMap.get("unitList"))) {
+            baseDuckInfo.setUnitList(paramsMap.get("unitList"));
+        }
+        if (StringUtils.isNotBlank(paramsMap.get("unitName"))) {
+            baseDuckInfo.setUnitName(paramsMap.get("unitName"));
+        }
+        if (StringUtils.isNotBlank(paramsMap.get("duckSex"))) {
+            baseDuckInfo.setDuckSex(Integer.parseInt(paramsMap.get("duckSex")));
+        }
+
+
         baseDuckInfo.setFarmId(Integer.parseInt(paramsMap.get("farmId")));
         baseDuckInfo.setDuckBreed(Integer.parseInt(paramsMap.get("duckBreed")));
-        baseDuckInfo.setDuckSex(Integer.parseInt(paramsMap.get("duckSex")));
         baseDuckInfo.setDuckBirthplace(paramsMap.get("duckBirthPlace"));
         String date = paramsMap.get("duckBirthDay");
         date = date + " 00:00:00";
@@ -131,8 +141,13 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         baseDuckInfo.setGenotype(paramsMap.get("genotype"));
         BigDecimal big = new BigDecimal(paramsMap.get("nowWeight"));
         baseDuckInfo.setNowWeight(big);
-        baseDuckInfo.setUnitId(Integer.parseInt(paramsMap.get("unitId")));
-        baseDuckInfo.setBreedingEnv(paramsMap.get("breedEnv"));
+        if (StringUtils.isNotBlank(paramsMap.get("unitId"))){
+            baseDuckInfo.setUnitId(Integer.parseInt(paramsMap.get("unitId")));
+        }
+        if (StringUtils.isNotBlank(paramsMap.get("breedEnv"))) {
+            baseDuckInfo.setBreedingEnv(paramsMap.get("breedEnv"));
+        }
+
 
         String fatherNum = paramsMap.get("fatherNum");
         String motherNum = paramsMap.get("motherNum");
@@ -173,10 +188,12 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                         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());
+                            if (StringUtils.isNotBlank(paramsMap.get("fatherNum"))) {
+                                baseDuckInfo.setFatherNum(paramsMap.get("fatherNum"));
+                                baseDuckInfo.setMotherNum(paramsMap.get("motherNum"));
+                                baseDuckInfo.setFatherGenotype(father.getGenotype());
+                                baseDuckInfo.setMotherGenotype(mother.getGenotype());
+                            }
                         }
                     }
                 }
@@ -189,30 +206,39 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         if (StringUtils.isBlank(motherNum) && StringUtils.isNotBlank(fatherNum)) {
             return new Result(10001, "父亲编号已填写，请输入母亲编号！", false);
         }
-        baseDuckInfo.setSpecialNeeds(paramsMap.get("specialNeeds"));
+        if (StringUtils.isNotBlank(paramsMap.get("specialNeeds"))) {
+            baseDuckInfo.setSpecialNeeds(paramsMap.get("specialNeeds"));
+        }
         baseDuckInfo.setIsCage(0);
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("chi_num", paramsMap.get("chiNum")).eq("farm_id", paramsMap.get("farmId"));
         Integer integer = duckInfoMapper.selectCount(queryWrapper);
-        QueryWrapper<BaseDuckInfo> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("jiao_num", paramsMap.get("jiaoNum")).eq("farm_id", paramsMap.get("farmId"));
-        Integer integer1 = duckInfoMapper.selectCount(queryWrapper2);
-        if (integer1 != 0) {
-            return new Result(10001, "鸭只脚号已存在", false);
+        if (StringUtils.isNotBlank(paramsMap.get("jiaoNum"))) {
+            QueryWrapper<BaseDuckInfo> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("jiao_num", paramsMap.get("jiaoNum")).eq("farm_id", paramsMap.get("farmId"));
+            Integer integer1 = duckInfoMapper.selectCount(queryWrapper2);
+            if (integer1 != 0) {
+                return new Result(10001, "鸭只脚号已存在", false);
+            }
         }
         if (integer == 0) {
-            QueryWrapper<BaseDuckInfo> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("unit_id", paramsMap.get("unitId"));
-            List<BaseDuckInfo> baseDuckInfos = duckInfoMapper.selectList(queryWrapper1);
-            for (BaseDuckInfo duckInfo : baseDuckInfos) {
-                if (duckInfo.getIsCage() == 0) {
-                    return new Result(10001, "鸭笼已被使用！", false);
+            if (StringUtils.isNotBlank(paramsMap.get("unitId"))) {
+                QueryWrapper<BaseDuckInfo> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("unit_id", paramsMap.get("unitId"));
+                List<BaseDuckInfo> baseDuckInfos = duckInfoMapper.selectList(queryWrapper1);
+                for (BaseDuckInfo duckInfo : baseDuckInfos) {
+                    if (duckInfo.getIsCage() == 0) {
+                        return new Result(10001, "鸭笼已被使用！", false);
+                    }
                 }
             }
+
             if (ObjectUtil.isEmpty(imgUrl)) {
                 String duckBreed = paramsMap.get("duckBreed");
-                if (Integer.parseInt(duckBreed) == 3 && Integer.parseInt(paramsMap.get("duckSex")) == 1) {
-                    duckBreed = "10";
+                if (StringUtils.isNotBlank(paramsMap.get("duckSex"))) {
+                    if (Integer.parseInt(duckBreed) == 3 && Integer.parseInt(paramsMap.get("duckSex")) == 1) {
+                        duckBreed = "10";
+                    }
                 }
                 QueryWrapper<BaseDuckBreedImg> imgQueryWrapper = new QueryWrapper<>();
                 imgQueryWrapper.eq("duck_breed", duckBreed);