耳标检验

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillBuyInfoServiceImpl.java

@@ -67,6 +67,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         if (eartagResult.getEartagList().size() != total){
            return new Result(10001,"交易数量与实际耳标号数量不符!",false);
         }
+        List<BaseAnimal> baseAnimals = new ArrayList<>();
         for (String eartagNo : eartagResult.getEartagList()) {
             BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartagNo));
             if (baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no",eartagNo).eq("belong_to_user",sellerId).eq("is_loated",0).eq("is_die",0).eq("animal_status",1).eq("animal_type",animalType)) == 0) {
@@ -78,7 +79,11 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             baseAnimal.setBuyerName(buyer);
             baseAnimal.setSellerName(seller);
             baseAnimal.setAnimalStatus(2);
+            baseAnimal.setInspectionNum(inspectionNum);
             baseAnimal.setBuyTime(DateTime.now());
+            baseAnimals.add(baseAnimal);
+        }
+        for (BaseAnimal baseAnimal : baseAnimals) {
             baseAnimalMapper.updateById(baseAnimal);
         }
         String content3 = "";

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -287,6 +287,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                             return new Result(10001,"耳标号"+s+"不存在",false);
                         }
                         baseAnimal.setIsDie(1);
+                        //TODO 加回滚
                         baseAnimalMapper.updateById(baseAnimal);
                     }else {
                         String start = s.substring(0, s.indexOf("-"));
@@ -314,6 +315,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                                 return new Result(10001,"耳标号"+number+"不存在",false);
                             }
                             animal.setIsDie(1);
+                            //TODO 加回滚
                             baseAnimalMapper.updateById(animal);
                         }
                     }
@@ -325,6 +327,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         return new Result(10001,"耳标号"+deaths+"不存在",false);
                     }
                     baseAnimal.setIsDie(1);
+                    //TODO 加回滚
                     baseAnimalMapper.updateById(baseAnimal);
                 }else {
                     String start = deaths.substring(0, deaths.indexOf("-"));
@@ -352,6 +355,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                             return new Result(10001,"耳标号"+number+"不存在",false);
                         }
                         animal.setIsDie(1);
+                        //TODO 加回滚
                         baseAnimalMapper.updateById(animal);
                     }
                 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillLandingInspectionServiceImpl.java

@@ -171,9 +171,9 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         if (!IntegerUtil.isInteger(animalNumberUp)){
             return new Result(10001, "头数应为整数！", false);
         }
-        String content = "";
-        int total = Integer.parseInt(animalNumberUp);
-        int sum = 0;
+       String content = "";
+       int total = Integer.parseInt(animalNumberUp);
+         /* int sum = 0;
         eartags = eartags.replace("，",",");
         eartags = eartags.replace(", ",",");
         eartags = eartags.replace("， ",",");
@@ -253,6 +253,17 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }
         if (sum != total){
             return new Result(10001,"实际耳标数量和填写数量不符!",false);
+        }*/
+        EartagResult eartagResult = EartagUtil.getEartagCollection(eartags);
+        if (!eartagResult.getSuccess()){
+            return new Result(10001,eartagResult.getMsg(),false);
+        }
+        if (eartagResult.getEartagList().size() != eartagResult.getEartagSet().size()) {
+            return new Result(10001,"耳标号存在重复",false);
+        }
+        System.out.println("具体耳标号"+eartagResult.getEartagList());
+        if (eartagResult.getEartagList().size() != total){
+            return new Result(10001,"交易数量与实际耳标号数量不符!",false);
         }
         content = getUrl(content,image1);
         content = getUrl(content,image2);
@@ -363,7 +374,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     }
 
     @Override
-    public Result rejectApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+    public Result   rejectApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
         String rejectReason = paramsMap.get("rejectReason");
         BillLandingInspection billLandingInspection = this.getById(id);