落地检耳标号判断格式

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

@@ -134,19 +134,25 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             }
         }
         if (eartags.contains(",")){
+            eartags.replace("，",",");
+            eartags.replace(", ",",");
+            eartags.replace("， ",",");
             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);
+                        return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
                     }
                     String end = input.substring(input.indexOf("-") + 1);
                     if (end.length() != 3){
-                        return new Result(10001,"耳标号格式错误",false);
+                        return new Result(10001,"耳标号"+input+"格式错误,-后需输入3位数字",false);
                     }
                     String substring1 = input.substring(start.length() - end.length(), start.length());
                     String substring = start.substring(0, start.length() - end.length());
+                    if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
+                        return new Result(10001,"耳标号"+input+"格式错误,包含-号耳标号需递增",false);
+                    }
                     List<String> eartagNos = new ArrayList<>();
                     for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
                         eartagNos.add(substring+i);
@@ -154,7 +160,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                     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);
+                            return new Result(10001,"耳标号"+number+"不存在",false);
                         }
                         if (ObjectUtil.isEmpty(sysUser)){
                             SysUser newUser = new SysUser();
@@ -176,14 +182,14 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 }else {
                     BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", input).eq("inspection_num",inspectionNum));
                     if (ObjectUtil.isEmpty(baseAnimal)){
-                        return new Result(10001,"耳标号不存在",false);
+                        return new Result(10001,"耳标号"+input+"不存在",false);
                     }
                     if (input.length() != 15){
-                        return new Result(10001,"耳标号格式错误",false);
+                        return new Result(10001,"耳标号"+input+"格式错误",false);
                     }
                     Integer num2 = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", input));
                     if (num2 != 0){
-                        return new Result(10001,"耳标号重复",false);
+                        return new Result(10001,"耳标号"+input+"重复",false);
                     }
                     if (ObjectUtil.isEmpty(sysUser)){
                         SysUser newUser = new SysUser();
@@ -207,17 +213,17 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             if (eartags.contains("-")){
                 String start = eartags.substring(0, eartags.indexOf("-"));
                 if (start.length() != 15){
-                    return new Result(10001,"耳标号格式错误",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误",false);
                 }
                 String end = eartags.substring(eartags.indexOf("-") + 1);
                 if (end.length() != 3){
-                    return new Result(10001,"耳标号格式错误",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误,-后需输入3位数字",false);
                 }
                 String substring1 = eartags.substring(start.length() - end.length(), start.length());
                 String substring = start.substring(0, start.length() - end.length());
                 System.out.println(substring);
                 if (Integer.parseInt(substring1) >Integer.parseInt(end)){
-                    return new Result(10001,"耳标号格式错误",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误,包含-号耳标号需递增",false);
                 }
                 List<String> eartagNos = new ArrayList<>();
                 for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
@@ -226,7 +232,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 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);
+                        return new Result(10001,"耳标号"+number+"不存在",false);
                     }
                     if (ObjectUtil.isEmpty(sysUser)){
                         SysUser newUser = new SysUser();
@@ -248,7 +254,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             }else {
                 BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartags).eq("inspection_num",inspectionNum));
                 if (ObjectUtil.isEmpty(baseAnimal)){
-                    return new Result(10001,"耳标号不存在",false);
+                    return new Result(10001,"耳标号"+eartags+"不存在",false);
                 }
                 if (ObjectUtil.isEmpty(sysUser)){
                     SysUser newUser = new SysUser();
@@ -303,9 +309,8 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             billBuyInfo1.setBillBuyStatus(2);
             this.updateById(billBuyInfo1);
         }
-
         if(ObjectUtil.isEmpty(sysUser)){
-            return new Result(10000,"买家用户信息不存在,已新建账号",true);
+            return new Result(10001,"买家用户信息不存在,已新建账号",false);
         }
         return Result.SUCCESS();
     }

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

@@ -85,6 +85,8 @@ 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();
         eartags.replace("，",",");
+        eartags.replace(", ",",");
+        eartags.replace("， ",",");
         if (eartags.contains(",")){
             String[] eartag = eartags.split(",");
             for (String input : eartag) {
@@ -266,6 +268,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         isolation.setIsolatedSch(2);
 
         deaths.replace("，",",");
+        deaths.replace(", ",",");
+        deaths.replace("，  ",",");
         if ("1".equals(isDead)){
             isolation.setIsDead(1);
             isolation.setDeaths(deaths);

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

@@ -159,6 +159,8 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }
         String eartags = billLandingInspection.getEartags();
         eartags.replace("，",",");
+        eartags.replace(", ",",");
+        eartags.replace("， ",",");
         if (eartags.contains(",")){
             String[] eartag = eartags.split(",");
             for (String input : eartag) {
@@ -166,42 +168,41 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                     String start = input.substring(0, input.indexOf("-"));
                     System.out.println("落地检耳标号:"+start);
                     if (start.length() != 15){
-                        return new Result(10001,"耳标号格式错误需输入15位数字",false);
+                        return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
                     }
                     String end = input.substring(input.indexOf("-") + 1);
                     if (end.length() != 3){
-                        return new Result(10001,"耳标号格式错误,-后需输入3位数字",false);
+                        return new Result(10001,"耳标号"+input+"格式错误,-后需输入3位数字",false);
                     }
                     String substring1 = input.substring(start.length() - end.length(), start.length());
-                    String substring = start.substring(0, start.length() - end.length());
-                    System.out.println(substring);
                     if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
-                        return new Result(10001,"耳标号格式错误，包含-号耳标号需递增",false);
+                        return new Result(10001,"耳标号"+input+"格式错误,包含-号耳标号需递增",false);
                     }
                 }else {
                     if (input.length() != 15){
-                        return new Result(10001,"耳标号格式错误需输入15位数字",false);
+                        return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
                     }
                 }
             }
         }else {
             if (eartags.contains("-")){
                 String start = eartags.substring(0, eartags.indexOf("-"));
+                System.out.println("落地检耳标号:"+start);
                 if (start.length() != 15){
-                    return new Result(10001,"耳标号格式错误需输入15位数字",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误需输入15位数字",false);
                 }
                 String end = eartags.substring(eartags.indexOf("-") + 1);
                 if (end.length() != 3){
-                    return new Result(10001,"耳标号格式错误,-后需输入3位数字",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误,-后需输入3位数字",false);
                 }
                 String substring1 = eartags.substring(start.length() - end.length(), start.length());
-                String substring = start.substring(0, start.length() - end.length());
                 if (Integer.parseInt(substring1) >Integer.parseInt(end)){
-                    return new Result(10001,"耳标号格式错误，包含-号耳标号需递增",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误,包含-号耳标号需递增",false);
                 }
             }else {
+                System.out.println("落地检耳标号:"+eartags);
                 if (eartags.length() != 15){
-                    return new Result(10001,"耳标号格式错误需输入15位数字",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误需输入15位数字",false);
                 }
             }
         }