检疫证号中耳标号重复

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

@@ -185,15 +185,15 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                     String base = eartags.substring(0, eartags.indexOf("-")-3);
                     System.out.println("落地检耳标号:"+start);
                     if (start.length() != 15){
-                        return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
+                        return new Result(10001,"耳标号格式错误需输入15位数字",false);
                     }
                     String end = input.substring(input.indexOf("-") + 1);
                     if (end.length() != 3){
-                        return new Result(10001,"耳标号"+input+"格式错误,-后需输入3位数字",false);
+                        return new Result(10001,"耳标号格式错误,-后需输入3位数字",false);
                     }
                     String substring1 = input.substring(start.length() - end.length(), start.length());
-                    if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
-                        return new Result(10001,"耳标号"+input+"格式错误,包含-号耳标号需递增",false);
+                    if (Integer.parseInt(substring1) >=Integer.parseInt(end) ){
+                        return new Result(10001,"耳标号格式错误,包含-号耳标号需递增",false);
                     }
                     for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
                         String s = String.valueOf(i);
@@ -206,7 +206,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                     }
                 }else {
                     if (input.length() != 15){
-                        return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
+                        return new Result(10001,"耳标号格式错误需输入15位数字",false);
                     }
                     eartagList.add(input);
                     sum++;
@@ -218,15 +218,15 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                 String base = eartags.substring(0, eartags.indexOf("-")-3);
                 System.out.println("落地检耳标号:"+start);
                 if (start.length() != 15){
-                    return new Result(10001,"耳标号"+eartags+"格式错误需输入15位数字",false);
+                    return new Result(10001,"耳标号格式错误需输入15位数字",false);
                 }
                 String end = eartags.substring(eartags.indexOf("-") + 1);
                 if (end.length() != 3){
-                    return new Result(10001,"耳标号"+eartags+"格式错误,-后需输入3位数字",false);
+                    return new Result(10001,"耳标号格式错误,-后需输入3位数字",false);
                 }
                 String substring1 = eartags.substring(start.length() - end.length(), start.length());
-                if (Integer.parseInt(substring1) >Integer.parseInt(end)){
-                    return new Result(10001,"耳标号"+eartags+"格式错误,包含-号耳标号需递增",false);
+                if (Integer.parseInt(substring1) >= Integer.parseInt(end)){
+                    return new Result(10001,"耳标号格式错误,包含-号耳标号需递增",false);
                 }
                 for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
                     String s = String.valueOf(i);
@@ -240,7 +240,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
             }else {
                 System.out.println("落地检耳标号:"+eartags);
                 if (eartags.length() != 15){
-                    return new Result(10001,"耳标号"+eartags+"格式错误需输入15位数字",false);
+                    return new Result(10001,"耳标号格式错误需输入15位数字",false);
                 }
                 eartagList.add(eartags);
                 sum++;