Browse Source

只有硬标有合同

master
han\hanst 2 months ago
parent
commit
e44eb0588b
  1. 16
      src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java
  2. BIN
      src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx
  3. BIN
      src/main/resources/templates/ALPHA/declaration-all-template.xlsx
  4. BIN
      src/main/resources/templates/TX/declaration-all-template-pdf.xlsx
  5. BIN
      src/main/resources/templates/TX/declaration-all-template.xlsx

16
src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java

@ -1309,9 +1309,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
extractedElements(data, templateAdapter); extractedElements(data, templateAdapter);
template.render(4); template.render(4);
// 第六个sheet - 合同 // 第六个sheet - 合同
templateAdapter.clearAll();
/*templateAdapter.clearAll();
extractedContract(data, templateAdapter); extractedContract(data, templateAdapter);
template.render(5);
template.render(5);*/
} else if (isHardtag) { } else if (isHardtag) {
ExcelTemplateYB template = ExcelTemplateYB.load(new ClassPathResource("templates/YB/declaration-all-template.xlsx").getInputStream()); ExcelTemplateYB template = ExcelTemplateYB.load(new ClassPathResource("templates/YB/declaration-all-template.xlsx").getInputStream());
ExcelTemplateAdapter templateAdapter = new Yb2ExcelTemplateAdapter(template); ExcelTemplateAdapter templateAdapter = new Yb2ExcelTemplateAdapter(template);
@ -1371,9 +1371,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
extractedElements(data, templateAdapter); extractedElements(data, templateAdapter);
template.render(4); template.render(4);
// 第六个sheet - 合同 // 第六个sheet - 合同
templateAdapter.clearAll();
/* templateAdapter.clearAll();
extractedContract(data, templateAdapter); extractedContract(data, templateAdapter);
template.render(5);
template.render(5);*/
} }
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@ -1431,9 +1431,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
template.render(3); template.render(3);
// 第五个sheet - 合同 // 第五个sheet - 合同
templateAdapter.clearAll();
/* templateAdapter.clearAll();
extractedContract(data, templateAdapter); extractedContract(data, templateAdapter);
template.render(4);
template.render(4);*/
} else if (isHardtag) { } else if (isHardtag) {
String xlsx = "templates/YB/declaration-all-template-pdf.xlsx"; String xlsx = "templates/YB/declaration-all-template-pdf.xlsx";
ExcelTemplateYB template = ExcelTemplateYB.load(new ClassPathResource(xlsx).getInputStream()); ExcelTemplateYB template = ExcelTemplateYB.load(new ClassPathResource(xlsx).getInputStream());
@ -1487,9 +1487,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
template.render(3); template.render(3);
// 第五个sheet - 合同 // 第五个sheet - 合同
templateAdapter.clearAll();
/*templateAdapter.clearAll();
extractedContract(data, templateAdapter); extractedContract(data, templateAdapter);
template.render(4);
template.render(4);*/
} }
// 将Excel转换为PDF // 将Excel转换为PDF

BIN
src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx

BIN
src/main/resources/templates/ALPHA/declaration-all-template.xlsx

BIN
src/main/resources/templates/TX/declaration-all-template-pdf.xlsx

BIN
src/main/resources/templates/TX/declaration-all-template.xlsx

Loading…
Cancel
Save