From 1ca386e8ec0adc4a4d6ffc133be1410f7703b123 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 4 Mar 2026 16:16:48 +0800 Subject: [PATCH] =?UTF-8?q?fix-=E5=AE=9A=E6=A1=88=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=BB=B7=E8=A1=A8=E6=A0=BC=E9=94=99=E4=B9=B1?= =?UTF-8?q?=EF=BC=8C=E5=A4=A7=E5=86=99=E5=85=AC=E5=BC=8F=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/ReportProjectController.java | 5 +++-- .../excelTemplate/控制价定案表.xls | Bin 17920 -> 17408 bytes .../excelTemplate/结算定案表.xls | Bin 17920 -> 17920 bytes 3 files changed, 3 insertions(+), 2 deletions(-) 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 1134740f0a22a0575ab11bf03bc7a90294d9d5bf..05f25037fea9d1266ae05d76c57b5e1bff28a2d0 100644 GIT binary patch delta 252 zcmZqZVQlDNoM6K!wbAxCBct48R;GB#fB*mg2Vofo1_oImmIq=GUtx12Q$6Fv1eQrG zIh-39+c&OUeTPwcaw$tQ({KIFzgRx1Fg@1Y{8lrT!z7(S0H`Sqh(X~0e+V7OAkN9S zFnU(>#ffugaQs(~oEgaZU+TXLKLg7FanZ@K#@gzR1`HhHjEv5K9PCVz4BQM@lz*G% z9JqO{u{a}>5y#|XCMrx%8799mG3Eo=$iTn|v>C`^*{o~2fpL>X2s>MYWj)ZPo1^SI RSlCS&jDXN|^Gj!OCIFqCP<{Xa delta 402 zcmZqZU~K4NoM6K!z0vkKBcuFeR;G9vDFz0HfB*mg2Vq$tTMmd7pkkXF%o-RcvE*=0 z`0H?Bcg7t?naQOr%}h58HveMzsKRtWZ}VHtSPt7nMggFPGzKOHejxq-Kac-E4w&x?hGqGss9}R)gxyHa{hN=WnekrD9Io$Ho4A7JJ>l8CIF_nC7C!G z#2Fb&QYAUK7{nPEBsrKFoR}FII2;Waz$$=}dQcV&eiLIpAqHNcrx_W9fRLAWbAZVP#?6sV%8Z-LLfF|D{vO}IJ7aT{Z3hdx3DC91 M3?`djI*Ky^0J8jKg8%>k diff --git a/src/main/resources/excelTemplate/结算定案表.xls b/src/main/resources/excelTemplate/结算定案表.xls index 3d2687c58f720080eb839faff07f77d39adab6fc..5b43259d09fdefa494648fb8b043cb6be4be9469 100644 GIT binary patch delta 3842 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 XP_9L;zyS~!3VEblF#hQ3)M@o!6{j+^