From edc7172b312e0aec94362b651e2f7145e0c357fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 16 一月 2025 17:04:10 +0800
Subject: [PATCH] 核算导出调整+osd测试脚本
---
ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
index 5227511..bbd8c77 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -122,6 +122,7 @@
AND tcr.status=#{status}
</if>
</where>
+ group by tcr.id
ORDER BY
tcr.create_time
</select>
@@ -146,14 +147,26 @@
</select>
<select id="exportData" resultType="com.ycl.platform.domain.excel.CalculateExport">
- SELECT a.rule_name,
- COUNT(b.id) AS num,
- IFNULL(-SUM(b.score), 0) AS score
+ SELECT
+ a.rule_name as ruleName,
+ a.rule_condition as detailName,
+ COUNT(b.id) AS num,
+ 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 And tcr.id = #{calculateId}
- LEFT JOIN t_contract_score b ON b.rule_id = a.id AND auditing_status = 'PASS' AND b.deleted = 0 AND YEAR (b.create_time) = tcr.which_year
- WHERE a.deleted = 0
- GROUP BY a.rule_name
+ LEFT JOIN t_calculate_record tcr ON a.contract_id = tcr.contract_id
+ LEFT JOIN t_contract_score b ON b.rule_id = a.id AND auditing_status = 'PASS' AND b.deleted = 0
+ AND MONTH(b.create_time) = tcr.which_month
+ AND YEAR(b.create_time) = tcr.which_year
+ <where>
+ a.deleted = 0 and a.contract_id = #{contractId}
+ <if test="whichMonth!=null">
+ and tcr.which_month = #{whichMonth}
+ </if>
+ <if test="whichYear!=null">
+ and tcr.which_year = #{whichYear}
+ </if>
+ </where>
+ GROUP BY a.id
</select>
</mapper>
--
Gitblit v1.8.0