fix-定案表和控制价表格错乱，大写公式不生效问题

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){