耳标检验

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/EartagUtil.java

@@ -14,7 +14,7 @@ public class EartagUtil {
     public static void main(String[] args) {
 //        String str =  "123456789123456-789";
 //        String str =  "123456789123456-45，456";
-        String str =  "123456789123006-010，789,654,123456789123456-457,";
+        String str =  "262060202417302";
         EartagResult eartagCollection = getEartagCollection(str);
         System.out.println(eartagCollection.toString());
     }
@@ -55,9 +55,8 @@ public class EartagUtil {
                 endSet.add(newEartag);
             }    else if (eartagLength ==15 ){
                 eartagPrefix =  eartag.substring(0,12);
-                newEartag =  eartagPrefix +eartag;
-                endList.add(newEartag);
-                endSet.add(newEartag);
+                endList.add(eartag);
+                endSet.add(eartag);
             }  else   if (eartagLength ==19){
                 eartagPrefix =  eartag.substring(0,12);
                 try {

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillLandingInspectionController.java

@@ -104,22 +104,6 @@ public class BillLandingInspectionController {
 
     @PostMapping("/listReadyApplication")
     public Result listReadyApplication(){
-//        List<BillLandingInspection> list = iBillLandingInspectionService.list(new QueryWrapper<BillLandingInspection>()
-//                .eq("inspection_sch", 4)
-//                .eq("is_delete", 0));
-//        List<BillLandingInspection> endlist = new ArrayList<>();
-//        // TODO 能不能搞sql
-//        for (BillLandingInspection billLandingInspection : list) {
-//            String inspectionNum = billLandingInspection.getInspectionNum();
-//            int count = baseAnimalService.count(new QueryWrapper<BaseAnimal>().eq("animal_status", 1)
-//                    .eq("inspection_num", inspectionNum)
-//                    .eq("is_die", 0));
-//            if (count>0){
-//                endlist.add(billLandingInspection);
-//            }
-//        }
-//
-//        List<String> inspectionNumList = billLandingInspectionService.
         return iBillLandingInspectionService.listReadyApplication();
     }