删除耳标管理-->导出耳标数据中的打码参数。

huimv-manage/src/main/java/com/huimv/manage/common/config/InterceptorConfig.java

@@ -20,7 +20,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/my/*");
+//        registry.addInterceptor(jwtInterceptor()).
+//                excludePathPatterns("/my/*");
     }
 }

huimv-manage/src/main/java/com/huimv/manage/eartag/controller/EarmarkController.java

@@ -183,13 +183,11 @@ public class EarmarkController {
      */
     @RequestMapping(value = "/exportEarmarkByEarmark",method = RequestMethod.GET)
     public void exportEarmarkByEarmark(@RequestParam(value = "ids",required = true) String ids,
-                                     @RequestParam(value = "printState",required = false) Integer printState,
                                      @RequestParam(value = "quantity",required = true) Integer quantity,
                                      HttpServletResponse response) throws IOException {
         log.info("ids="+ids);
-        log.info("printState="+printState);
         log.info("quantity="+quantity);
         //
-        earmarkService.exportEarmarkByEarmark(ids,printState,quantity,response);
+        earmarkService.exportEarmarkByEarmark(ids,quantity,response);
     }
 }

huimv-manage/src/main/java/com/huimv/manage/eartag/service/IEarmarkService.java

@@ -31,5 +31,5 @@ public interface IEarmarkService {
     void exportEarmarkByApply(Integer applyId, Integer printState,Integer quantity, HttpServletResponse response) throws IOException;
 
     // 通过耳标号导出耳标数据
-    void exportEarmarkByEarmark(String ids, Integer printState, Integer quantity, HttpServletResponse response) throws IOException;
+    void exportEarmarkByEarmark(String ids, Integer quantity, HttpServletResponse response) throws IOException;
 }

huimv-manage/src/main/java/com/huimv/manage/eartag/service/impl/EarmarkServiceImpl.java

@@ -326,7 +326,7 @@ public class EarmarkServiceImpl implements IEarmarkService {
         };
         //
         List<EtEarmarkEntity> dataList = earmarkRepo.findAll(specific);
-        log.info("导出数据数量:"+dataList.size());
+        log.info("导出数据数量="+dataList.size());
         //
         excelUtil.exportEarmarkExcel(response,Const.EXPORT_EARMARK_EXCEL,String.valueOf(applyId),dataList,quantity);
         // test
@@ -334,7 +334,7 @@ public class EarmarkServiceImpl implements IEarmarkService {
     }
 
     @Override
-    public void exportEarmarkByEarmark(String ids, Integer printState, Integer quantity, HttpServletResponse response) throws IOException {
+    public void exportEarmarkByEarmark(String ids, Integer quantity, HttpServletResponse response) throws IOException {
         Specification<EtEarmarkEntity> specific = (Specification<EtEarmarkEntity>) (root, criteriaQuery, criteriaBuilder) -> {
 
             //
@@ -348,9 +348,6 @@ public class EarmarkServiceImpl implements IEarmarkService {
 //                predList.add(criteriaBuilder.equal(root.get("id").as(Integer.class), applyId));
                 predList.add(root.get("id").as(Integer.class).in(idArrInt));
             }
-            if (null != printState) {
-                predList.add(criteriaBuilder.equal(root.get("printState").as(Integer.class), printState));
-            }
             //
             Predicate[] pred = new Predicate[predList.size()];
             Predicate and = criteriaBuilder.and(predList.toArray(pred));
@@ -362,6 +359,7 @@ public class EarmarkServiceImpl implements IEarmarkService {
         };
         //
         List<EtEarmarkEntity> dataList = earmarkRepo.findAll(specific);
+        log.info("导出数据数量:"+dataList.size());
         String applyId = null;
         if(dataList.size() > 0){
             EtEarmarkEntity earmarkEntity = dataList.get(0);