diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java index d462e039..7095760b 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java @@ -1309,9 +1309,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { extractedElements(data, templateAdapter); template.render(4); // 第六个sheet - 合同 - templateAdapter.clearAll(); + /*templateAdapter.clearAll(); extractedContract(data, templateAdapter); - template.render(5); + template.render(5);*/ } else if (isHardtag) { ExcelTemplateYB template = ExcelTemplateYB.load(new ClassPathResource("templates/YB/declaration-all-template.xlsx").getInputStream()); ExcelTemplateAdapter templateAdapter = new Yb2ExcelTemplateAdapter(template); @@ -1371,9 +1371,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { extractedElements(data, templateAdapter); template.render(4); // 第六个sheet - 合同 - templateAdapter.clearAll(); + /* templateAdapter.clearAll(); extractedContract(data, templateAdapter); - template.render(5); + template.render(5);*/ } response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); @@ -1431,9 +1431,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { template.render(3); // 第五个sheet - 合同 - templateAdapter.clearAll(); + /* templateAdapter.clearAll(); extractedContract(data, templateAdapter); - template.render(4); + template.render(4);*/ } else if (isHardtag) { String xlsx = "templates/YB/declaration-all-template-pdf.xlsx"; ExcelTemplateYB template = ExcelTemplateYB.load(new ClassPathResource(xlsx).getInputStream()); @@ -1487,9 +1487,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { template.render(3); // 第五个sheet - 合同 - templateAdapter.clearAll(); + /*templateAdapter.clearAll(); extractedContract(data, templateAdapter); - template.render(4); + template.render(4);*/ } // 将Excel转换为PDF diff --git a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx index 1a344b6f..095395f1 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx index f1a4d263..9f772ad7 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx index f5b61d6c..d0a547d3 100644 Binary files a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-all-template.xlsx b/src/main/resources/templates/TX/declaration-all-template.xlsx index ab72c97a..d5664697 100644 Binary files a/src/main/resources/templates/TX/declaration-all-template.xlsx and b/src/main/resources/templates/TX/declaration-all-template.xlsx differ