From e2edaf30f4bf2213fe55c9817980001a1ea23e9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
index bbd8c77..6852b2a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -151,6 +151,7 @@
a.rule_name as ruleName,
a.rule_condition as detailName,
COUNT(b.id) AS num,
+ a.calc_fraction as calcFraction,
IFNULL(-SUM(b.score), 0) AS score
FROM t_calculate_rule a
LEFT JOIN t_calculate_record tcr ON a.contract_id = tcr.contract_id
--
Gitblit v1.8.0