diff --git a/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java b/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java index 41b61d0..32e027a 100644 --- a/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java +++ b/src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java @@ -500,7 +500,7 @@ public class ReportProjectController { priceVo.setThirdlyAuditor(vo.getReview().getThirdlyAuditor()); } String filePathName ="控制价定案表"; - if ("结算项目".equals(vo.getProject().getProjectType())){ + if ("结算项目".equals(vo.getProject().getReportType())){ filePathName = "结算定案表"; }else{ filePathName = "控制价定案表"; @@ -527,7 +527,8 @@ public class ReportProjectController { excelWriter.fill(priceVo, fillConfig, writeSheet); //触发计算公式 Workbook workbook = excelWriter.writeContext().writeWorkbookHolder().getWorkbook(); - workbook.getCreationHelper().createFormulaEvaluator().evaluateAll(); + workbook.setForceFormulaRecalculation(true); +// workbook.getCreationHelper().createFormulaEvaluator().evaluateAll(); excelWriter.finish(); }catch (Exception e){ diff --git a/src/main/resources/excelTemplate/控制价定案表.xls b/src/main/resources/excelTemplate/控制价定案表.xls index 1134740..05f2503 100644 Binary files a/src/main/resources/excelTemplate/控制价定案表.xls and b/src/main/resources/excelTemplate/控制价定案表.xls differ diff --git a/src/main/resources/excelTemplate/结算定案表.xls b/src/main/resources/excelTemplate/结算定案表.xls index 3d2687c..5b43259 100644 Binary files a/src/main/resources/excelTemplate/结算定案表.xls and b/src/main/resources/excelTemplate/结算定案表.xls differ