1

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java

@@ -89,7 +89,7 @@ public interface ScmSpecialrebateCheckapplyFeign {
     @ApiOperation("生成专项返利核对pdf")
     @PostMapping("/createPdf")
     @ResponseBody
-    ResultBean<PdfPath> createPdf(@RequestParam("specialCheckSid") String specialCheckSid, @RequestParam("userName") String userName);
+    ResultBean<String> createPdf(@RequestParam("specialCheckSid") String specialCheckSid, @RequestParam("userName") String userName);
 
     /**************************************专项返利核对审批流程*******************************************/
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java

@@ -81,7 +81,7 @@ public class ScmSpecialrebateCheckapplyFeignFallback implements ScmSpecialrebate
 	}
 
 	@Override
-	public ResultBean<PdfPath> createPdf(String specialCheckSid, String userName) {
+	public ResultBean<String> createPdf(String specialCheckSid, String userName) {
 		return null;
 	}
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java

@@ -89,7 +89,7 @@ public interface ScmSpecialRebateWithApplyFeign {
     @ApiOperation("生成专项返利预提pdf")
     @PostMapping("/createPdf")
     @ResponseBody
-    ResultBean<PdfPath> createPdf(@RequestParam("specialWithSid") String specialWithSid, @RequestParam("userName") String userName);
+    ResultBean<String> createPdf(@RequestParam("specialWithSid") String specialWithSid, @RequestParam("userName") String userName);
 
     /**************************************专项返利预提审批流程*******************************************/
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeignFallback.java

@@ -78,7 +78,7 @@ public class ScmSpecialRebateWithApplyFeignFallback implements ScmSpecialRebateW
 	}
 
 	@Override
-	public ResultBean<PdfPath> createPdf(String specialWithSid, String userName) {
+	public ResultBean<String> createPdf(String specialWithSid, String userName) {
 		return null;
 	}
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java

@@ -90,7 +90,7 @@ public interface ScmVehrebateCheckapplyFeign {
     @ApiOperation("生成单车返利核对pdf")
     @PostMapping("/createPdf")
     @ResponseBody
-    ResultBean<PdfPath> createPdf(@RequestParam("vehCheckSid") String vehCheckSid, @RequestParam("userName") String userName);
+    ResultBean<String> createPdf(@RequestParam("vehCheckSid") String vehCheckSid, @RequestParam("userName") String userName);
 
     /**************************************单车返利核对审批流程*******************************************/
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java

@@ -78,7 +78,7 @@ public class ScmVehrebateCheckapplyFeignFallback implements ScmVehrebateCheckapp
 	}
 
 	@Override
-	public ResultBean<PdfPath> createPdf(String vehCheckSid, String userName) {
+	public ResultBean<String> createPdf(String vehCheckSid, String userName) {
 		return null;
 	}
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeign.java

@@ -89,7 +89,7 @@ public interface ScmVehRebateWithApplyFeign {
     @ApiOperation("生成单车返利预提pdf")
     @PostMapping("/createPdf")
     @ResponseBody
-    ResultBean<PdfPath> createPdf(@RequestParam("vehWithSid") String vehWithSid,@RequestParam("userName") String userName);
+    ResultBean<String> createPdf(@RequestParam("vehWithSid") String vehWithSid,@RequestParam("userName") String userName);
 
     /**************************************单车返利预提审批流程*******************************************/
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java

@@ -77,7 +77,7 @@ public class ScmVehRebateWithApplyFeignFallback implements ScmVehRebateWithApply
 	}
 
 	@Override
-	public ResultBean<PdfPath> createPdf(String vehWithSid, String userName) {
+	public ResultBean<String> createPdf(String vehWithSid, String userName) {
 		return null;
 	}
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java

@@ -88,9 +88,9 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
     }
 
     @Override
-    public ResultBean<PdfPath> createPdf(String specialCheckSid, String userName) {
+    public ResultBean<String> createPdf(String specialCheckSid, String userName) {
         ResultBean rb = ResultBean.fireFail();
-        PdfPath pdf = scmSpecialrebateCheckapplyService.createPdf(specialCheckSid, userName);
+        String pdf = scmSpecialrebateCheckapplyService.createPdf(specialCheckSid, userName);
         return rb.success().setData(pdf);
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -1057,8 +1057,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
         return rb.success();
     }
 
-    public PdfPath createPdf(String specialCheckSid, String userName) {
+    public String createPdf(String specialCheckSid, String userName) {
-        PdfPath pdfPath = new PdfPath();
         ScmSpecialrebateCheckapplyDetailsVo scmSpecialrebateCheckapplyDetailsVo = fetchDetailsVoBySid(specialCheckSid).getData();
         //获取专项返利核对
         List<ScmSpecialrebateCheckapplydetailDetailsVo> scmWhenSpecialrebateCheckapplydetailDetails = scmSpecialrebateCheckapplyDetailsVo.getScmWhenSpecialrebateCheckapplydetailDetails();
@@ -1168,8 +1167,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
         String wordPath = targetPath + "\\" + typeName;
         //生成出门证文件名
         String pdfName = "专项返利核对_" + dateStr + seconds + ".pdf";
-        WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
+        WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
-        pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
+        return "/template/" + dateStr + "/" + pdfName;
-        return pdfPath;
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java

@@ -101,9 +101,9 @@ public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyF
     }
 
     @Override
-    public ResultBean<PdfPath> createPdf(String specialWithSid, String userName) {
+    public ResultBean<String> createPdf(String specialWithSid, String userName) {
         ResultBean rb = ResultBean.fireFail();
-        PdfPath pdf = scmSpecialRebateWithApplyService.createPdf(specialWithSid, userName);
+        String pdf = scmSpecialRebateWithApplyService.createPdf(specialWithSid, userName);
         return rb.success().setData(pdf);
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -719,8 +719,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
         return rb.success();
     }
 
-    public PdfPath createPdf(String specialWithSid, String userName) {
+    public String createPdf(String specialWithSid, String userName) {
-        PdfPath pdfPath = new PdfPath();
         ScmSpecialRebateWithApplyDetailsVo scmSpecialRebateWithApplyDetailsVo = fetchAllDetailsVo(specialWithSid).getData();
         //获取专项返利预提
         List<ScmSpecialRebateWithDetailsVo> scmSpecialRebateWiths = scmSpecialRebateWithApplyDetailsVo.getScmSpecialRebateWiths();
@@ -822,8 +821,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
         String wordPath = targetPath + "\\" + typeName;
         //生成出门证文件名
         String pdfName = "专项返利预提_" + dateStr + seconds + ".pdf";
-        WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
+        WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
-        pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
+        return "/template/" + dateStr + "/" + pdfName;
-        return pdfPath;
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java

@@ -102,9 +102,9 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
     }
 
     @Override
-    public ResultBean<PdfPath> createPdf(String vehCheckSid, String userName) {
+    public ResultBean<String> createPdf(String vehCheckSid, String userName) {
         ResultBean rb = ResultBean.fireFail();
-        PdfPath pdf = scmVehrebateCheckapplyService.createPdf(vehCheckSid, userName);
+        String pdf = scmVehrebateCheckapplyService.createPdf(vehCheckSid, userName);
         return rb.success().setData(pdf);
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -975,8 +975,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
         return rb.success();
     }
 
-    public PdfPath createPdf(String vehCheckSid, String userName) {
+    public String createPdf(String vehCheckSid, String userName) {
-        PdfPath pdfPath = new PdfPath();
         ScmVehrebateCheckapplyDetailsVo scmVehrebateCheckapplyDetailsVo = fetchDetailsBySid(vehCheckSid).getData();
         //获取单车返利预提
         List<ScmVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetails = scmVehrebateCheckapplyDetailsVo.getScmWhenVehrebateCheckapplydetailDetails();
@@ -1086,8 +1085,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
         String wordPath = targetPath + "\\" + typeName;
         //生成出门证文件名
         String pdfName = "单车返利核对_" + dateStr + seconds + ".pdf";
-        WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
+        WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
-        pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
+        return "/template/" + dateStr + "/" + pdfName;
-        return pdfPath;
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java

@@ -100,9 +100,9 @@ public class ScmVehRebateWithApplyRest implements ScmVehRebateWithApplyFeign {
     }
 
     @Override
-    public ResultBean<PdfPath> createPdf(String vehWithSid, String userName) {
+    public ResultBean<String> createPdf(String vehWithSid, String userName) {
         ResultBean rb = ResultBean.fireFail();
-        PdfPath pdf = scmVehRebateWithApplyService.createPdf(vehWithSid, userName);
+        String pdf = scmVehRebateWithApplyService.createPdf(vehWithSid, userName);
         return rb.success().setData(pdf);
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -769,8 +769,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
         return rb.success();
     }
 
-    public PdfPath createPdf(String vehWithSid, String userName) {
+    public String createPdf(String vehWithSid, String userName) {
-        PdfPath pdfPath = new PdfPath();
         ScmVehRebateWithApplyDetailsVo scmVehRebateWithApplyDetailsVo = fetchAllDetailsVo(vehWithSid).getData();
         //获取单车返利预提
         List<ScmVehRebateWithDetailsVo> scmVehRebateWiths = scmVehRebateWithApplyDetailsVo.getScmVehRebateWiths();
@@ -871,8 +870,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
         String wordPath = targetPath + "\\" + typeName;
         //生成出门证文件名
         String pdfName = "单车返利预提_" + dateStr + seconds + ".pdf";
-        WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
+        WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
-        pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
+        return "/template/" + dateStr + "/" + pdfName;
-        return pdfPath;
     }
 }

anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl

@@ -1634,7 +1634,7 @@
                                     <w:tc>
                                         <w:tcPr>
                                             <w:tcW w:w="1350" w:type="dxa"/>
-                                            <w:vmerge/>
+                                            <w:vMerge w:val="continue"/>
                                             <w:gridSpan w:val="3"/>
                                             <w:tcBorders>
                                                 <w:bottom w:val="single" w:sz="4" w:space="0" w:color="auto"/>

anrui-scm/anrui-scm-biz/src/main/resources/ftl/zxyt.ftl

@@ -1398,7 +1398,7 @@
                                     <w:tc>
                                         <w:tcPr>
                                             <w:tcW w:w="1350" w:type="dxa"/>
-                                            <w:vmerge />
+                                            <w:vMerge w:val="continue"/>
                                             <w:gridSpan w:val="3"/>
                                             <w:tcBorders>
                                                 <w:bottom w:val="single" w:color="auto" w:sz="4" w:space="0"/>