检疫证号中耳标号重复

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

@@ -104,21 +104,23 @@ 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);
-            }
-        }
-        return new Result(ResultCode.SUCCESS,endlist);
+//        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();
     }
 
     @PostMapping("/listPersonal")

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillLandingInspectionMapper.java

@@ -3,6 +3,8 @@ package com.huimv.farm.damsubsidy.mapper;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 落地检 Mapper 接口
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BillLandingInspectionMapper extends BaseMapper<BillLandingInspection> {
 
+    List<BillLandingInspection> listReadyApplication();
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillLandingInspectionService.java

@@ -35,4 +35,6 @@ public interface IBillLandingInspectionService extends IService<BillLandingInspe
     Result getEartagNoBy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile image1,MultipartFile image2,MultipartFile image3,MultipartFile image4,MultipartFile image5) throws IOException;
+
+    Result listReadyApplication();
 }

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

@@ -23,6 +23,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -175,11 +176,13 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         eartags = eartags.replace("，",",");
         eartags = eartags.replace(", ",",");
         eartags = eartags.replace("， ",",");
+        List eartagList = new ArrayList();
         if (eartags.contains(",")){
             String[] eartag = eartags.split(",");
             for (String input : eartag) {
                 if (input.contains("-")){
                     String start = input.substring(0, input.indexOf("-"));
+                    String base = eartags.substring(0, eartags.indexOf("-")-3);
                     System.out.println("落地检耳标号:"+start);
                     if (start.length() != 15){
                         return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
@@ -193,18 +196,26 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                         return new Result(10001,"耳标号"+input+"格式错误,包含-号耳标号需递增",false);
                     }
                     for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
+                        String s = String.valueOf(i);
+                        while (s.length() < 3) {
+                            s = "0".concat(s);
+                        }
+                        s = base.concat(s);
+                        eartagList.add(s);
                         sum++;
                     }
                 }else {
                     if (input.length() != 15){
                         return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
                     }
+                    eartagList.add(input);
                     sum++;
                 }
             }
         }else {
             if (eartags.contains("-")){
                 String start = eartags.substring(0, eartags.indexOf("-"));
+                String base = eartags.substring(0, eartags.indexOf("-")-3);
                 System.out.println("落地检耳标号:"+start);
                 if (start.length() != 15){
                     return new Result(10001,"耳标号"+eartags+"格式错误需输入15位数字",false);
@@ -218,6 +229,12 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                     return new Result(10001,"耳标号"+eartags+"格式错误,包含-号耳标号需递增",false);
                 }
                 for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
+                    String s = String.valueOf(i);
+                    while (s.length() < 3) {
+                        s = "0".concat(s);
+                    }
+                    s = base.concat(s);
+                    eartagList.add(s);
                     sum++;
                 }
             }else {
@@ -225,9 +242,14 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                 if (eartags.length() != 15){
                     return new Result(10001,"耳标号"+eartags+"格式错误需输入15位数字",false);
                 }
+                eartagList.add(eartags);
                 sum++;
             }
         }
+        HashSet set = new HashSet(eartagList);
+        if (set.size() != eartagList.size()){
+            return new Result(10001,"存在重复耳标号!",false);
+        }
         if (sum != total){
             return new Result(10001,"实际耳标数量和填写数量不符!",false);
         }
@@ -262,7 +284,17 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }
     }
 
-  
+    @Override
+    public Result listReadyApplication() {
+        List<BillLandingInspection> inspectionNumList = billLandingInspectionMapper.listReadyApplication();
+        if (ObjectUtil.isNotEmpty(inspectionNumList)){
+            return new Result(ResultCode.SUCCESS,inspectionNumList);
+        }else {
+            return new Result(10001,"无符合要求的检疫证号!",false);
+        }
+    }
+
+
     public  String getUrl(String content, MultipartFile image) throws IOException {
         if (ObjectUtil.isNotEmpty(image)){
             if ( !"".equals(content)){

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillLandingInspectionMapper.xml

@@ -27,4 +27,12 @@
         <result column="is_delete" property="isDelete" />
     </resultMap>
 
+    <select id="listReadyApplication" resultType="com.huimv.farm.damsubsidy.entity.BillLandingInspection">
+          SELECT DISTINCT(a1.inspection_num),a1.inspection_sch,a1.inspection_type,a1.cargo_owner,a1.owner_phone,a1.animal_type,a1.animal_number_up,a1.use_to,a1.start_tran,a1.reach_tran,a1.eartags FROM
+ (SELECT DISTINCT(l.inspection_num),l.inspection_sch,l.inspection_type,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,l.eartags
+ FROM `bill_landing_inspection` l LEFT JOIN `base_animal` a ON l.inspection_num = a.inspection_num
+ WHERE l.inspection_sch = 4 AND l.is_delete = 0) AS a1
+ LEFT JOIN `base_animal` a ON a1.inspection_num = a.inspection_num
+ WHERE a.is_die = 0
+    </select>
 </mapper>