打印pdf修改

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

@@ -11,7 +11,7 @@ import java.util.Set;
 import java.util.regex.Pattern;
 
 public class EartagUtil {
-    public static void main(String[] args) {
+  /*  public static void main(String[] args) {
 //        String str =  "123456789123456-789";
 //        String str =  "123456789123456-45，456";
 //        String str =  "262070202253993-994";
@@ -23,9 +23,9 @@ public class EartagUtil {
         System.out.println(eartagCollection1);
         System.out.println(eartagCollection1.split(",").length);
 
-    }
+    }*/
 
-    private static String getEartagCollection2(String str) {
+    public static String getEartagCollection2(String str) {
         String[] split = str.split(",");
         String substring = split[0].substring(0, 12);
         StringBuilder stringBuilder = new StringBuilder();

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

@@ -6,15 +6,13 @@ import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
-import com.huimv.farm.damsubsidy.common.utils.Result;
-import com.huimv.farm.damsubsidy.common.utils.ResultCode;
-import com.huimv.farm.damsubsidy.common.utils.UploadImage;
+import com.huimv.farm.damsubsidy.common.utils.*;
 import com.huimv.farm.damsubsidy.entity.AreaAll;
 import com.huimv.farm.damsubsidy.entity.BillSubsidy;
+import com.huimv.farm.damsubsidy.entity.EartagResult;
 import com.huimv.farm.damsubsidy.entity.SysUser;
 import com.huimv.farm.damsubsidy.service.IAreaAllService;
 import com.huimv.farm.damsubsidy.service.IBillSubsidyService;
-import com.huimv.farm.damsubsidy.common.utils.PdfUtil;
 import com.huimv.farm.damsubsidy.service.ISysUserService;
 import com.huimv.farm.damsubsidy.test.QrCodeExcelPrinter;
 import com.huimv.farm.test.Print;
@@ -146,7 +144,8 @@ public class BillSubsidyController {
         String encode = Base64.getEncoder().encodeToString(str.getBytes());
         System.out.println(encode);
         codeExcelPrinter.test(encode);
-        Print.print(subsidy);
+        String collection2 = EartagUtil.getEartagCollection2(subsidy.getEartagNo());
+        Print.print(subsidy,collection2);
         String path = "/opt/subsidy/order_contract.xls";
 
         //加载Excel文档

admin/src/main/java/com/huimv/farm/test/Print.java

@@ -1,6 +1,7 @@
 package com.huimv.farm.test;
 
 import com.huimv.farm.damsubsidy.entity.BillSubsidy;
+import com.huimv.farm.damsubsidy.entity.EartagResult;
 import org.jxls.common.Context;
 import org.jxls.util.JxlsHelper;
 import org.jxls.util.Util;
@@ -19,7 +20,7 @@ public class Print {
      * @throws Exception
      * @return
      */
-    public  static void print(BillSubsidy subsidy) throws Exception {
+    public  static void print(BillSubsidy subsidy, String eartagResult) throws Exception {
         //准备数据
         //
         String path ="/opt/subsidy/order_contract.xls";
@@ -79,7 +80,7 @@ public class Print {
         context.putVar("context1", subsidy.getRewardLastYear());
         context.putVar("card", subsidy.getInspectionNum());
         context.putVar("context2", subsidy.getLoanInfo());
-        context.putVar("earNum", subsidy.getEartagNo());
+        context.putVar("earNum", eartagResult);
         context.putVar("money", subsidy.getApplyMoney());
         context.putVar("userNum", subsidy.getBankCardId());
         //生成