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

Effort Task #4099 Cost:0.5h 合并行和列数字调整

Browse Source
This commit is contained in:
chenyunlong 2023-07-27 20:41:26 +08:00
parent aabc3449ac
commit b69f6af1e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,11 +147,11 @@ public class ContractService {
//如果是签收单，则需要合并单元格 //如果是签收单，则需要合并单元格
if (Consts.RECEIPT_FORM.equals(templateName)){ if (Consts.RECEIPT_FORM.equals(templateName)){
List<Object> invoiceResList = (List<Object>) MapUtils.getObject(dataMap, "invoiceResList"); 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));
} }
if (Consts.RECEIPT_INVOICE.equals(templateName)){ if (Consts.RECEIPT_INVOICE.equals(templateName)){
List<Object> invoiceResList = (List<Object>) MapUtils.getObject(dataMap, "invoiceResList"); List<Object> invoiceResList = (List<Object>) 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"; String docxFile = "/"+ UUID.randomUUID().toString().replace("-", "") + ".docx";