补贴不修改耳标号 隔离判断检疫是否在隔离中

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

@@ -209,7 +209,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 return new Result(10001,"操作失败",false);
             }
         }
-        BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", isolation.getInspectionNum()).eq("inspection_type",0));
+        BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>()
+                .eq("inspection_num", isolation.getInspectionNum()).eq("inspection_sch",3).eq("inspection_type",0));
         billLandingInspection.setReviewedTime(DateTime.now());
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setInspectionSch(4);

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

@@ -990,15 +990,16 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         for (String s : result) {
             eartags.add(s);
         }
-        List<BaseAnimal> baseAnimals = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>().in("earatg_no", eartags));
-        for (BaseAnimal baseAnimal : baseAnimals) {
-            baseAnimal.setAnimalStatus(4);
-            if (baseAnimalMapper.updateById(baseAnimal) != 1) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return new Result(10001, "耳标号" + baseAnimal.getEaratgNo() + "修改失败", false);
+        if (ObjectUtil.isNotEmpty(eartags)){
+            List<BaseAnimal> baseAnimals = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>().in("earatg_no", eartags));
+            for (BaseAnimal baseAnimal : baseAnimals) {
+                baseAnimal.setAnimalStatus(4);
+                if (baseAnimalMapper.updateById(baseAnimal) != 1) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return new Result(10001, "耳标号" + baseAnimal.getEaratgNo() + "修改失败", false);
+                }
             }
         }
-
         BillSubsidyModify billSubsidyModify = new BillSubsidyModify();
         billSubsidyModify.setSubsidyId(id);
         billSubsidyModify.setUpdateUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));