隔离耳标号处理

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

@@ -84,27 +84,32 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
 
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum).ne("inspection_sch", 5));
         String eartags = billLandingInspection.getEartags();
-
+        if (eartags.length() != 15){
+            return new Result(10001,"耳标号格式错误",false);
+        }
         if (eartags.contains(",")){
             String[] eartag = eartags.split(",");
             for (String input : eartag) {
                 if (input.contains("-")){
                     String start = input.substring(0, input.indexOf("-"));
                     String end = input.substring(input.indexOf("-") + 1);
+                    if (end.length() != 3){
+                        return new Result(10001,"耳标号格式错误",false);
+                    }
+                    String substring1 = input.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();
-                        Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                    for (String eartagNo : eartagNos) {
+                        Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartagNo));
                         if (num != 0){
                             return new Result(10001,"耳标号重复",false);
                         }
                         BaseAnimal baseAnimal = new BaseAnimal();
-                        baseAnimal.setEaratgNo(earatgNo);
+                        baseAnimal.setEaratgNo(eartagNo);
                         baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                         baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
                         baseAnimal.setBelongToUser(userName);
@@ -131,20 +136,23 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             if (eartags.contains("-")){
                 String start = eartags.substring(0, eartags.indexOf("-"));
                 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();
-                    Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                for (String number : eartagNos) {
+                    Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", number));
                     if (num != 0){
                         return new Result(10001,"耳标号重复",false);
                     }
                     BaseAnimal baseAnimal = new BaseAnimal();
-                    baseAnimal.setEaratgNo(earatgNo);
+                    baseAnimal.setEaratgNo(number);
                     baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                     baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
                     baseAnimal.setBelongToUser(userName);
@@ -263,15 +271,18 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     }else {
                         String start = s.substring(0, s.indexOf("-"));
                         String end = s.substring(s.indexOf("-") + 1);
+                        if (end.length() != 3){
+                            return new Result(10001,"耳标号格式错误",false);
+                        }
+                        String substring1 = s.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 animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                        for (String number : eartagNos) {
+                            BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number));
                             if (ObjectUtil.isEmpty(animal)){
                                 return new Result(10001,"耳标号不存在",false);
                             }
@@ -291,15 +302,18 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 }else {
                     String start = deaths.substring(0, deaths.indexOf("-"));
                     String end = deaths.substring(deaths.indexOf("-") + 1);
+                    if (end.length() != 3){
+                        return new Result(10001,"耳标号格式错误",false);
+                    }
+                    String substring1 = deaths.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 animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                    for (String number : eartagNos) {
+                        BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number));
                         if (ObjectUtil.isEmpty(animal)){
                             return new Result(10001,"耳标号不存在",false);
                         }