耳标

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

@@ -151,22 +151,26 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             this.updateById(billBuyInfo1);
         }
 
-
         if (eartags.contains(",")){
             String[] eartag = eartags.split(",");
             for (String input : eartag) {
                 if (input.contains("-")){
                     String start = input.substring(0, input.indexOf("-"));
+                    if (start.length() != 15){
+                        return new Result(10001,"耳标号格式错误",false);
+                    }
                     String end = input.substring(input.indexOf("-") + 1);
+                    if (end.length() != 3){
+                        return new Result(10001,"耳标号格式错误",false);
+                    }
+                    String substring1 = input.substring(start.length() - end.length(), start.length());
                     String substring = start.substring(0, start.length() - end.length());
-                    String finish = substring+end;
-                    List<Integer> numbers = new ArrayList<>();
-                    for (int i = Integer.parseInt(start); i <= Integer.parseInt(finish); i++) {
-                        numbers.add(i);
+                    List<String> eartagNos = new ArrayList<>();
+                    for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
+                        eartagNos.add(substring+i);
                     }
-                    for (Integer number : numbers) {
-                        String earatgNo = number.toString();
-                        BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo).eq("inspection_num",inspectionNum));
+                    for (String number : eartagNos) {
+                        BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number).eq("inspection_num",inspectionNum));
                         if (ObjectUtil.isEmpty(baseAnimal)){
                             return new Result(10001,"耳标号不存在",false);
                         }
@@ -178,6 +182,13 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                         baseAnimalMapper.updateById(baseAnimal);
                     }
                 }else {
+                    if (input.length() != 15){
+                        return new Result(10001,"耳标号格式错误",false);
+                    }
+                    Integer num2 = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", input));
+                    if (num2 != 0){
+                        return new Result(10001,"耳标号重复",false);
+                    }
                     BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", input).eq("inspection_num",inspectionNum));
                     if (ObjectUtil.isEmpty(baseAnimal)){
                         return new Result(10001,"耳标号不存在",false);
@@ -193,16 +204,22 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         }else {
             if (eartags.contains("-")){
                 String start = eartags.substring(0, eartags.indexOf("-"));
+                if (start.length() != 15){
+                    return new Result(10001,"耳标号格式错误",false);
+                }
                 String end = eartags.substring(eartags.indexOf("-") + 1);
+                if (end.length() != 3){
+                    return new Result(10001,"耳标号格式错误",false);
+                }
+                String substring1 = eartags.substring(start.length() - end.length(), end.length()+1);
                 String substring = start.substring(0, start.length() - end.length());
-                String finish = substring+end;
-                List<Integer> numbers = new ArrayList<>();
-                for (int i = Integer.parseInt(start); i <= Integer.parseInt(finish); i++) {
-                    numbers.add(i);
+                System.out.println(substring);
+                List<String> eartagNos = new ArrayList<>();
+                for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
+                    eartagNos.add(substring+i);
                 }
-                for (Integer number : numbers) {
-                    String earatgNo = number.toString();
-                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo).eq("inspection_num",inspectionNum));
+                for (String number : eartagNos) {
+                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number).eq("inspection_num",inspectionNum));
                     if (ObjectUtil.isEmpty(baseAnimal)){
                         return new Result(10001,"耳标号不存在",false);
                     }

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

@@ -154,7 +154,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         if (this.count(landingInspectionQueryWrapper) != 0) {
             return new Result(10001, "存在相同检疫证号！", false);
         }
-        billLandingInspection.setInspectionName(billLandingInspection.getCargoOwner() + "的落地检疫申请");
+        billLandingInspection.setInspectionName(TokenSign.getUserName(httpServletRequest) + "的落地检疫申请");
         billLandingInspection.setCreateTime(DateTime.now());
         billLandingInspection.setCreateUser(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setInspectionType(0);