回滚

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillBuyInfoController.java

@@ -57,6 +57,9 @@ public class BillBuyInfoController {
             billBuyInfoImageVoList.add(billBuyInfoImageVo);
         }
         billBuyInfoVoPage.setRecords(billBuyInfoImageVoList);
+        billBuyInfoVoPage.setTotal(billBuyInfoPage.getTotal());
+        billBuyInfoVoPage.setCountId(billBuyInfoPage.getCountId());
+        billBuyInfoVoPage.setCurrent(billBuyInfoPage.getCurrent());
         return new Result(ResultCode.SUCCESS, billBuyInfoVoPage);
     }
 

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

@@ -184,15 +184,14 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         BillIsolated isolation = this.getById(id);
         isolation.setIsolatedPicUrl(content);
         isolation.setIsolatedSch(2);
-
-        EartagResult eartagCollection = EartagUtil.getEartagCollection(deaths);
-        if (!eartagCollection.getSuccess()){
-            return new Result(10001,eartagCollection.getMsg(),false);
-        }
-        List<String> eartagList = eartagCollection.getEartagList();
         if ("1".equals(isDead)){
             isolation.setIsDead(1);
             isolation.setDeaths(deaths);
+            EartagResult eartagCollection = EartagUtil.getEartagCollection(deaths);
+            if (!eartagCollection.getSuccess()){
+                return new Result(10001,eartagCollection.getMsg(),false);
+            }
+            List<String> eartagList = eartagCollection.getEartagList();
             for (String number : eartagList) {
                 BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number));
                 if (ObjectUtil.isEmpty(animal)){

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

@@ -263,7 +263,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }
         System.out.println("具体耳标号"+eartagResult.getEartagList());
         if (eartagResult.getEartagList().size() != total){
-            return new Result(10001,"交易数量与实际耳标号数量不符!",false);
+            return new Result(10001,"数量与实际耳标号数量不符!",false);
         }
         content = getUrl(content,image1);
         content = getUrl(content,image2);