diff --git a/server/src/main/java/cn/keking/service/ContractService.java b/server/src/main/java/cn/keking/service/ContractService.java index 1daeae6..dc1f1ab 100644 --- a/server/src/main/java/cn/keking/service/ContractService.java +++ b/server/src/main/java/cn/keking/service/ContractService.java @@ -147,11 +147,11 @@ 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)); } if (Consts.RECEIPT_INVOICE.equals(templateName)){ List invoiceResList = (List) MapUtils.getObject(dataMap, "invoiceResList"); - mergeCell(xwpfDocument,0,6,6+invoiceResList.size()-1,Arrays.asList(5,6)); + mergeCell(xwpfDocument,0,7,7+invoiceResList.size()-1,Arrays.asList(5,6)); } String docxFile = "/"+ UUID.randomUUID().toString().replace("-", "") + ".docx";