From a1278f8b1edebde8114ca4add0f32d74495a835b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 20 二月 2025 14:21:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
index 9787572..0db7f41 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
@@ -238,6 +238,11 @@
.add(BigDecimal.valueOf(100)) // 鍔犱笂100
.setScale(1, RoundingMode.HALF_UP));
list.add(calculateExport);
+ list.forEach(item->{
+ if("纭繚褰曞儚瀹屾暣涓嶅畾鏈熷鎵�鏈夌偣浣嶅綍鍍忓畬鏁存�ф娊鏌�".equals(item.getRuleName())){
+ item.setNum(item.getScore().abs().divide(item.getCalcFraction(),0,RoundingMode.HALF_UP).intValue());
+ }
+ });
// 鑾峰彇瑙勫垯
List<CalculateRule> ruleList = calculateRuleService.list(new LambdaQueryWrapper<CalculateRule>().eq(CalculateRule::getContractId, contractId));
// 杈撳嚭鏂囦欢
--
Gitblit v1.8.0