From c0c7ae7f15559189836fe35da9b448690954ed67 Mon Sep 17 00:00:00 2001 From: chenyunlong <1437007432@qq.com> Date: Thu, 27 Jul 2023 21:32:42 +0800 Subject: [PATCH] =?UTF-8?q?Effort=20Task=20#4099=20Cost:0.5h=20=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=A1=8C=E5=92=8C=E5=88=97=E6=95=B0=E5=AD=97=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/src/main/java/cn/keking/service/ContractService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/cn/keking/service/ContractService.java b/server/src/main/java/cn/keking/service/ContractService.java index dc1f1ab..736a1bf 100644 --- a/server/src/main/java/cn/keking/service/ContractService.java +++ b/server/src/main/java/cn/keking/service/ContractService.java @@ -248,7 +248,7 @@ public class ContractService { //如果是签收单,则需要合并单元格 if (Consts.RECEIPT_FORM.equals(templateName)){ List invoiceResList = (List) MapUtils.getObject(dataMap, "invoiceResList"); - mergeCell(xwpfDocument,0,6,6+invoiceResList.size()-1,Arrays.asList(4,5)); + mergeCell(xwpfDocument,0,7,7+invoiceResList.size()-1,Arrays.asList(5,6)); } String docxFile = "/"+ UUID.randomUUID().toString().replace("-", "") + ".docx"; String pdfName = "/"+ UUID.randomUUID().toString().replace("-", "") + ".pdf";