浏览代码

概预算导出模板变动

lem 4 年之前
父节点
当前提交
e8b9242cb8

+ 6 - 2
src/main/java/com/jeeplus/modules/sg/financial/settlement/util/MyExportUtil.java

@@ -138,7 +138,9 @@ public class MyExportUtil {
                     Cell cell18 = crateCellLeft(workbook,row,18); //法人管理费(余物清理费)
                     Cell cell19 = crateCell(workbook,row,19); //合同费率
                     Cell cell20 = crateCell(workbook,row,20); //典设费率
-                    Cell cell21 = crateCell(workbook,row,21); //合同费率
+                    Cell cell21 = crateCell(workbook,row,21); //设计含税税率
+                    Cell cell22 = crateCell(workbook,row,22); //合同费率
+                    Cell cell23 = crateCell(workbook,row,23); //监理含税税率
                     ProjectBudget view = list.get(i);
                     cell0.setCellValue(getString(view.getProjectName()));
                     cell1.setCellValue(getString(view.getProjectId()));
@@ -161,7 +163,9 @@ public class MyExportUtil {
                     cell18.setCellValue(getDouble(view.getAdministrationCost()));
                     cell19.setCellValue(getDouble(view.getDesignContractDiscount()));
                     cell20.setCellValue(getDouble(view.getDesignTypicalDiscount()));
-                    cell21.setCellValue(getDouble(view.getSupervisorContractDiscount()));
+                    cell21.setCellValue(getDouble(view.getDesignTaxRate()));
+                    cell22.setCellValue(getDouble(view.getSupervisorContractDiscount()));
+                    cell23.setCellValue(getDouble(view.getSupervisorTaxRate()));
                 }
             }
             String str = URLEncoder.encode("导出财务项目概预算信息.xlsx", "UTF8");

二进制
src/main/resources/freemarker/projectBudget.xlsx