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";