diff --git a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java index 09f418b..46b9569 100644 --- a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java +++ b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java @@ -432,15 +432,16 @@ public abstract class IncomeCostBean { || null == costPurchaseServiceTaxInclude || null == costPurchaseOtherTaxInclude // || null == costProjectManageTaxInclude - || null == costOtherOtherTaxInclude) { + // || null == costOtherOtherTaxInclude + ) { return handleSpecial(null); } return costPurchaseDeviceTaxInclude .add(costPurchaseBuildTaxInclude) .add(costPurchaseServiceTaxInclude) - .add(costPurchaseOtherTaxInclude) + .add(costPurchaseOtherTaxInclude); // .add(costProjectManageTaxInclude) - .add(costOtherOtherTaxInclude); + // .add(costOtherOtherTaxInclude); } /** diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 06355a6..8a6c589 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -171,12 +171,12 @@ public class ProjectController extends BaseController { response.setHeader("Content-Type", "application/vnd.ms-excel"); ServletOutputStream outputStream = response.getOutputStream(); ExportExcelUtils exportExcelUtils = new ExportExcelUtils(); - String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", "合同金额", - "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", "客户名称", "最终用户名称", - "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "计收计划","项目阶段", "公司销售阶段", "当前进度描述", "下一步计划"}; - String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", - "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", - "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "calculationCollection","stageName", "saleStageName", "stageRemark", "nextPlan"}; + String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "合同金额", + "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "客户名称", "最终用户名称", + "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "是否汇智中标", "计收计划","项目阶段", "公司销售阶段", "当前进度描述"}; + String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", + "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "customer", "terminalCustomer", + "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "calculationCollection","stageName", "saleStageName", "stageRemark"}; exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream); if (project.getStatus() < 5) { @@ -185,12 +185,12 @@ public class ProjectController extends BaseController { } ProjectBudget projectBudget = projectService.findBudgetByProjectId(project.getId()); - String[] headers1 = {"部门名称", "项目编号", "项目名称", "合同名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", "合同金额", - "项目毛利A", "项目毛利A利率", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", "客户名称", "最终用户名称", - "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划"}; - String[] columns1 = {"deptNameBudget", "projectNoBudget", "nameBudget", "contractBudget", "typeDescBudget", "startDateBudget", "endDateBudget", "underwrittenModeStrBudget", "collaboratorBudget", "advanceInterestAmountRoundBudget", "advancePeakAmountRoundBudget", "contractRoundBudget", - "grossProfitARoundBudget", "grossProfitAMarginRoundBudget", "grossProfitRoundBudget", "grossProfitMarginRoundBudget", "huazhiRoundBudget", "huizhiRoundBudget", "huasanRoundBudget", "ziguangRoundBudget", "certaintyStrBudget", "industryScenarioBudget", "resolvePlanStrBudget", "customerBudget", "terminalCustomerBudget", - "valueRiskBudget", "principalBudget", "contractTimeBudget", "bidsTimeBudget", "isSecondStrBudget", "signTypeStrBudget", "mainContractCollectionTermsBudget", "mainContractResolvePlanBudget", "calculationCollectionBudget"}; + String[] headers1 = {"部门名称", "项目编号", "项目名称", "合同名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "合同金额", + "项目毛利A", "项目毛利A利率", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "客户名称", "最终用户名称", + "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "是否汇智中标", "计收计划"}; + String[] columns1 = {"deptNameBudget", "projectNoBudget", "nameBudget", "contractBudget", "typeDescBudget", "underwrittenModeStrBudget", "advanceInterestAmountRoundBudget", "advancePeakAmountRoundBudget", "contractRoundBudget", + "grossProfitARoundBudget", "grossProfitAMarginRoundBudget", "grossProfitRoundBudget", "grossProfitMarginRoundBudget", "huazhiRoundBudget", "huizhiRoundBudget", "huasanRoundBudget", "ziguangRoundBudget", "certaintyStrBudget", "industryScenarioBudget", "customerBudget", "terminalCustomerBudget", + "valueRiskBudget", "principalBudget", "contractTimeBudget", "bidsTimeBudget", "isSecondStrBudget", "signTypeStrBudget", "calculationCollectionBudget"}; exportExcelUtils.exportProjectBudgetExcel(headers1, columns1, projectBudget, "yyyy-MM-dd", 0, "项目基本信息", outputStream); BudgetBean budgetBean = projectBudgetService.getBudget(project); @@ -1210,12 +1210,12 @@ public class ProjectController extends BaseController { response.setHeader("Content-Type", "application/vnd.ms-excel"); ServletOutputStream outputStream = response.getOutputStream(); ExportExcelUtils exportExcelUtils = new ExportExcelUtils(); - String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", - "合同金额", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", - "客户名称", "最终用户名称", "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "计收计划", "项目阶段", "公司销售阶段", "当前进度描述", "下一步计划"}; - String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", - "contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", - "customer", "terminalCustomer", "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "calculationCollection", "stageName", "saleStageName", "stageRemark", "nextPlan"}; + String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", + "合同金额", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", + "客户名称", "最终用户名称", "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "是否汇智中标", "计收计划", "项目阶段", "公司销售阶段", "当前进度描述"}; + String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", + "contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", + "customer", "terminalCustomer", "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "calculationCollection", "stageName", "saleStageName", "stageRemark"}; exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream); exportExcelUtils.end(outputStream); @@ -1233,11 +1233,11 @@ public class ProjectController extends BaseController { ServletOutputStream outputStream = response.getOutputStream(); ExportExcelUtils exportExcelUtils = new ExportExcelUtils(); ProjectBudget projectBudget = projectService.findBudgetByProjectId(project.getId()); - String[] headers1 = {"部门名称", "项目编号", "项目名称", "合同名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", "合同金额", - "项目毛利A", "项目毛利A利率", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", "客户名称", "最终用户名称", - "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划"}; - String[] columns1 = {"deptNameBudget", "projectNoBudget", "nameBudget", "contractBudget", "typeDescBudget", "startDateBudget", "endDateBudget", "underwrittenModeStrBudget", "collaboratorBudget", "advanceInterestAmountRoundBudget", "advancePeakAmountRoundBudget", "contractRoundBudget", - "grossProfitARoundBudget", "grossProfitAMarginRoundBudget", "grossProfitRoundBudget", "grossProfitMarginRoundBudget", "huazhiRoundBudget", "huizhiRoundBudget", "huasanRoundBudget", "ziguangRoundBudget", "certaintyStrBudget", "industryScenarioBudget", "resolvePlanStrBudget", "customerBudget", "terminalCustomerBudget", + String[] headers1 = {"部门名称", "项目编号", "项目名称", "合同名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "合同金额", + "项目毛利A", "项目毛利A利率", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "客户名称", "最终用户名称", + "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "是否汇智中标", "主合同收款条款", "主合同具体解决方案", "计收计划"}; + String[] columns1 = {"deptNameBudget", "projectNoBudget", "nameBudget", "contractBudget", "typeDescBudget", "underwrittenModeStrBudget", "advanceInterestAmountRoundBudget", "advancePeakAmountRoundBudget", "contractRoundBudget", + "grossProfitARoundBudget", "grossProfitAMarginRoundBudget", "grossProfitRoundBudget", "grossProfitMarginRoundBudget", "huazhiRoundBudget", "huizhiRoundBudget", "huasanRoundBudget", "ziguangRoundBudget", "certaintyStrBudget", "industryScenarioBudget", "customerBudget", "terminalCustomerBudget", "valueRiskBudget", "principalBudget", "contractTimeBudget", "bidsTimeBudget", "isSecondStrBudget", "signTypeStrBudget", "mainContractCollectionTermsBudget", "mainContractResolvePlanBudget", "calculationCollectionBudget"}; exportExcelUtils.exportProjectBudgetExcel(headers1, columns1, projectBudget, "yyyy-MM-dd", 0, "项目基本信息", outputStream); diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 3e56bdd..3577f0d 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -749,6 +749,10 @@ public class ProjectBudgetService { String month = budgetPlan.getMonth(); Map projectPayments = monthlyProjectPaymentSum.getOrDefault(month, Collections.emptyMap()); + BigDecimal deviceCostTemp = projectPayments.getOrDefault("1", BigDecimal.ZERO); + budgetPlan.setDeviceCost(deviceCostTemp); + + BigDecimal projectCostTemp = projectPayments.getOrDefault("2", BigDecimal.ZERO); budgetPlan.setProjectCost(projectCostTemp); diff --git a/src/main/java/cn/palmte/work/utils/excel/ExportExcelUtils.java b/src/main/java/cn/palmte/work/utils/excel/ExportExcelUtils.java index 5758fc4..4c326e4 100644 --- a/src/main/java/cn/palmte/work/utils/excel/ExportExcelUtils.java +++ b/src/main/java/cn/palmte/work/utils/excel/ExportExcelUtils.java @@ -205,10 +205,10 @@ public class ExportExcelUtils { createTitleRow(profitRow, "利润率计算"); index = createProfitRow(budgetBean, sheet, index); index = index + 3; - // 现金流量表 - Row cashFLowRow = sheet.createRow(index++); - createTitleRow(cashFLowRow, "现金流量表"); - createCashFlowRow(cashFlowBean, sheet, index); + // // 现金流量表 + // Row cashFLowRow = sheet.createRow(index++); + // createTitleRow(cashFLowRow, "现金流量表"); + // createCashFlowRow(cashFlowBean, sheet, index); } @@ -360,7 +360,7 @@ public class ExportExcelUtils { createServiceCostRow(budgetBean, sheet, index++); createOtherCostRow(budgetBean, sheet, index++); // createManageCostRow(budgetBean, sheet, index++); - createOtherRow(budgetBean, sheet, index++, otherName); + // createOtherRow(budgetBean, sheet, index++, otherName); createTotalCostRow(budgetBean, sheet, index++); Row row = sheet.createRow(index++); Cell remarkCell = row.createCell(0); @@ -372,27 +372,27 @@ public class ExportExcelUtils { private void createSubTitleCostRow(XSSFSheet sheet, int index) { Row row = sheet.createRow(index); - Cell firstCell = row.createCell(0); - firstCell.setCellStyle(style); - firstCell.setCellType(CellType.STRING); - firstCell.setCellValue("类别"); - Cell secondCell = row.createCell(1); - secondCell.setCellStyle(style); - secondCell.setCellType(CellType.STRING); - secondCell.setCellValue("费用"); - Cell thirdCell = row.createCell(2); + // Cell firstCell = row.createCell(0); + // firstCell.setCellStyle(style); + // firstCell.setCellType(CellType.STRING); + // firstCell.setCellValue("类别"); + // Cell secondCell = row.createCell(1); + // secondCell.setCellStyle(style); + // secondCell.setCellType(CellType.STRING); + // secondCell.setCellValue("费用"); + Cell thirdCell = row.createCell(0); thirdCell.setCellStyle(style); thirdCell.setCellType(CellType.STRING); thirdCell.setCellValue("费用项目"); - Cell fourthCell = row.createCell(3); + Cell fourthCell = row.createCell(1); fourthCell.setCellStyle(style); fourthCell.setCellType(CellType.STRING); fourthCell.setCellValue("含税金额(元)"); - Cell fifthCell = row.createCell(4); + Cell fifthCell = row.createCell(2); fifthCell.setCellStyle(style); fifthCell.setCellType(CellType.STRING); fifthCell.setCellValue("不含税金额(元)"); - Cell sixthCell = row.createCell(5); + Cell sixthCell = row.createCell(3); sixthCell.setCellStyle(style); sixthCell.setCellType(CellType.STRING); sixthCell.setCellValue("税金(元)"); @@ -400,27 +400,27 @@ public class ExportExcelUtils { private void createDeviceCostRow(BudgetBean budgetBean, XSSFSheet sheet, int index) { Row row = sheet.createRow(index); - Cell firstCell = row.createCell(0); - firstCell.setCellStyle(style2); - firstCell.setCellType(CellType.STRING); - firstCell.setCellValue("成本"); - Cell secondCell = row.createCell(1); - secondCell.setCellStyle(style2); - secondCell.setCellType(CellType.STRING); - secondCell.setCellValue("采购成本"); - Cell thirdCell = row.createCell(2); + // Cell firstCell = row.createCell(0); + // firstCell.setCellStyle(style2); + // firstCell.setCellType(CellType.STRING); + // firstCell.setCellValue("成本"); + // Cell secondCell = row.createCell(1); + // secondCell.setCellStyle(style2); + // secondCell.setCellType(CellType.STRING); + // secondCell.setCellValue("采购成本"); + Cell thirdCell = row.createCell(0); thirdCell.setCellStyle(style2); thirdCell.setCellType(CellType.STRING); thirdCell.setCellValue("设备"); - Cell fourthCell = row.createCell(3); + Cell fourthCell = row.createCell(1); fourthCell.setCellStyle(style2); fourthCell.setCellType(CellType.NUMERIC); fourthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseDeviceTaxInclude())); - Cell fifthCell = row.createCell(4); + Cell fifthCell = row.createCell(2); fifthCell.setCellStyle(style2); fifthCell.setCellType(CellType.NUMERIC); fifthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseDeviceTaxExclude())); - Cell sixthCell = row.createCell(5); + Cell sixthCell = row.createCell(3); sixthCell.setCellStyle(style2); sixthCell.setCellType(CellType.NUMERIC); sixthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseDeviceTax())); @@ -428,27 +428,27 @@ public class ExportExcelUtils { private void createEngineerCostRow(BudgetBean budgetBean, XSSFSheet sheet, int index) { Row row = sheet.createRow(index); - Cell firstCell = row.createCell(0); - firstCell.setCellStyle(style2); - firstCell.setCellType(CellType.STRING); - firstCell.setCellValue("成本"); - Cell secondCell = row.createCell(1); - secondCell.setCellStyle(style2); - secondCell.setCellType(CellType.STRING); - secondCell.setCellValue("采购成本"); - Cell thirdCell = row.createCell(2); + // Cell firstCell = row.createCell(0); + // firstCell.setCellStyle(style2); + // firstCell.setCellType(CellType.STRING); + // firstCell.setCellValue("成本"); + // Cell secondCell = row.createCell(1); + // secondCell.setCellStyle(style2); + // secondCell.setCellType(CellType.STRING); + // secondCell.setCellValue("采购成本"); + Cell thirdCell = row.createCell(0); thirdCell.setCellStyle(style2); thirdCell.setCellType(CellType.STRING); thirdCell.setCellValue("工程"); - Cell fourthCell = row.createCell(3); + Cell fourthCell = row.createCell(1); fourthCell.setCellStyle(style2); fourthCell.setCellType(CellType.NUMERIC); fourthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseBuildTaxInclude())); - Cell fifthCell = row.createCell(4); + Cell fifthCell = row.createCell(2); fifthCell.setCellStyle(style2); fifthCell.setCellType(CellType.NUMERIC); fifthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseBuildTaxExclude())); - Cell sixthCell = row.createCell(5); + Cell sixthCell = row.createCell(3); sixthCell.setCellStyle(style2); sixthCell.setCellType(CellType.NUMERIC); sixthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseBuildTax())); @@ -456,27 +456,27 @@ public class ExportExcelUtils { private void createServiceCostRow(BudgetBean budgetBean, XSSFSheet sheet, int index) { Row row = sheet.createRow(index); - Cell firstCell = row.createCell(0); - firstCell.setCellStyle(style2); - firstCell.setCellType(CellType.STRING); - firstCell.setCellValue("成本"); - Cell secondCell = row.createCell(1); - secondCell.setCellStyle(style2); - secondCell.setCellType(CellType.STRING); - secondCell.setCellValue("采购成本"); - Cell thirdCell = row.createCell(2); + // Cell firstCell = row.createCell(0); + // firstCell.setCellStyle(style2); + // firstCell.setCellType(CellType.STRING); + // firstCell.setCellValue("成本"); + // Cell secondCell = row.createCell(1); + // secondCell.setCellStyle(style2); + // secondCell.setCellType(CellType.STRING); + // secondCell.setCellValue("采购成本"); + Cell thirdCell = row.createCell(0); thirdCell.setCellStyle(style2); thirdCell.setCellType(CellType.STRING); thirdCell.setCellValue("服务"); - Cell fourthCell = row.createCell(3); + Cell fourthCell = row.createCell(1); fourthCell.setCellStyle(style2); fourthCell.setCellType(CellType.NUMERIC); fourthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseServiceTaxInclude())); - Cell fifthCell = row.createCell(4); + Cell fifthCell = row.createCell(2); fifthCell.setCellStyle(style2); fifthCell.setCellType(CellType.NUMERIC); fifthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseServiceTaxExclude())); - Cell sixthCell = row.createCell(5); + Cell sixthCell = row.createCell(3); sixthCell.setCellStyle(style2); sixthCell.setCellType(CellType.NUMERIC); sixthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseServiceTax())); @@ -484,27 +484,27 @@ public class ExportExcelUtils { private void createOtherCostRow(BudgetBean budgetBean, XSSFSheet sheet, int index) { Row row = sheet.createRow(index); - Cell firstCell = row.createCell(0); - firstCell.setCellStyle(style2); - firstCell.setCellType(CellType.STRING); - firstCell.setCellValue("成本"); - Cell secondCell = row.createCell(1); - secondCell.setCellStyle(style2); - secondCell.setCellType(CellType.STRING); - secondCell.setCellValue("采购成本"); - Cell thirdCell = row.createCell(2); + // Cell firstCell = row.createCell(0); + // firstCell.setCellStyle(style2); + // firstCell.setCellType(CellType.STRING); + // firstCell.setCellValue("成本"); + // Cell secondCell = row.createCell(1); + // secondCell.setCellStyle(style2); + // secondCell.setCellType(CellType.STRING); + // secondCell.setCellValue("采购成本"); + Cell thirdCell = row.createCell(0); thirdCell.setCellStyle(style2); thirdCell.setCellType(CellType.STRING); thirdCell.setCellValue("其他"); - Cell fourthCell = row.createCell(3); + Cell fourthCell = row.createCell(1); fourthCell.setCellStyle(style2); fourthCell.setCellType(CellType.NUMERIC); fourthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseOtherTaxInclude())); - Cell fifthCell = row.createCell(4); + Cell fifthCell = row.createCell(2); fifthCell.setCellStyle(style2); fifthCell.setCellType(CellType.NUMERIC); fifthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseOtherTaxExclude())); - Cell sixthCell = row.createCell(5); + Cell sixthCell = row.createCell(3); sixthCell.setCellStyle(style2); sixthCell.setCellType(CellType.NUMERIC); sixthCell.setCellValue(Utils.format(budgetBean.getCostPurchaseOtherTax())); @@ -528,27 +528,27 @@ public class ExportExcelUtils { private void createOtherRow(BudgetBean budgetBean, XSSFSheet sheet, int index, String otherName) { Row row = sheet.createRow(index); - Cell firstCell = row.createCell(0); - firstCell.setCellStyle(style2); - firstCell.setCellType(CellType.STRING); - firstCell.setCellValue("成本"); - Cell secondCell = row.createCell(1); - secondCell.setCellStyle(style2); - secondCell.setCellType(CellType.STRING); - secondCell.setCellValue("其他"); - Cell thirdCell = row.createCell(2); + // Cell firstCell = row.createCell(0); + // firstCell.setCellStyle(style2); + // firstCell.setCellType(CellType.STRING); + // firstCell.setCellValue("成本"); + // Cell secondCell = row.createCell(1); + // secondCell.setCellStyle(style2); + // secondCell.setCellType(CellType.STRING); + // secondCell.setCellValue("其他"); + Cell thirdCell = row.createCell(0); thirdCell.setCellStyle(style2); thirdCell.setCellType(CellType.STRING); thirdCell.setCellValue(otherName); - Cell fourthCell = row.createCell(3); + Cell fourthCell = row.createCell(1); fourthCell.setCellStyle(style2); fourthCell.setCellType(CellType.NUMERIC); fourthCell.setCellValue(Utils.format(budgetBean.getCostOtherOtherTaxInclude())); - Cell fifthCell = row.createCell(4); + Cell fifthCell = row.createCell(2); fifthCell.setCellStyle(style2); fifthCell.setCellType(CellType.NUMERIC); fifthCell.setCellValue(Utils.format(budgetBean.getCostOtherOtherTaxExclude())); - Cell sixthCell = row.createCell(5); + Cell sixthCell = row.createCell(3); sixthCell.setCellStyle(style2); sixthCell.setCellType(CellType.NUMERIC); sixthCell.setCellValue(Utils.format(budgetBean.getCostOtherOtherTax())); @@ -560,23 +560,23 @@ public class ExportExcelUtils { firstCell.setCellStyle(style2); firstCell.setCellType(CellType.STRING); firstCell.setCellValue("合计"); - Cell secondCell = row.createCell(1); - secondCell.setCellStyle(style2); - secondCell.setCellType(CellType.STRING); - secondCell.setCellValue(""); - Cell thirdCell = row.createCell(2); - thirdCell.setCellStyle(style2); - thirdCell.setCellType(CellType.STRING); - thirdCell.setCellValue(""); - Cell fourthCell = row.createCell(3); + // Cell secondCell = row.createCell(1); + // secondCell.setCellStyle(style2); + // secondCell.setCellType(CellType.STRING); + // secondCell.setCellValue(""); + // Cell thirdCell = row.createCell(2); + // thirdCell.setCellStyle(style2); + // thirdCell.setCellType(CellType.STRING); + // thirdCell.setCellValue(""); + Cell fourthCell = row.createCell(1); fourthCell.setCellStyle(style2); fourthCell.setCellType(CellType.NUMERIC); fourthCell.setCellValue(Utils.format(budgetBean.getCostTotalTaxInclude())); - Cell fifthCell = row.createCell(4); + Cell fifthCell = row.createCell(2); fifthCell.setCellStyle(style2); fifthCell.setCellType(CellType.NUMERIC); fifthCell.setCellValue(Utils.format(budgetBean.getCostTotalTaxExclude())); - Cell sixthCell = row.createCell(5); + Cell sixthCell = row.createCell(3); sixthCell.setCellStyle(style2); sixthCell.setCellType(CellType.NUMERIC); sixthCell.setCellValue(Utils.format(budgetBean.getCostTotalTax()));