xiaoqi/crm-print
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into beta

Browse Source
This commit is contained in:
huangsheng 2023-07-27 21:33:25 +08:00
commit 82313a7470
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/cn/keking/service/ContractService.java
View File

@ -248,7 +248,7 @@ public class ContractService {
//如果是签收单，则需要合并单元格
if (Consts.RECEIPT_FORM.equals(templateName)){
List<Object> invoiceResList = (List<Object>) 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";