From 31d3591b34d4f26ad2ab207ca3044048d9adb9df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 17:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml
index bce717e..b8944a7 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml
@@ -3,24 +3,17 @@
<mapper namespace="com.ycl.platform.mapper.CalculateRecordMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CalculateRecordVO">
+ <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CalculateReportDetailVO">
<result column="id" property="id" />
<result column="create_time" property="createTime" />
- <result column="rule_id" property="ruleId" />
- <result column="rule_name" property="ruleName" />
- <result column="contract_id" property="contractId" />
+ <result column="deduct_category" property="unitName" />
+ <result column="score_condition" property="contractName" />
+ <result column="description" property="calculateTime" />
<result column="deduct_money" property="deductMoney" />
- <result column="score" property="score" />
+ <result column="score" property="deductMoney" />
+ <collection property="recordList" column="contract_id" select="selectByContractId" ofType="com.ycl.platform.domain.vo.CalculateMoneyRuleVO"/>
</resultMap>
- <select id="getByContractId" resultMap="BaseResultMap">
- SELECT
- tcr.id, tcr.create_time, tcr.deduct_money, tcru.rule_name, tcr.score, tcr.rule_id
- FROM
- t_calculate_record tcr
- INNER JOIN t_calculate_rule tcru ON tcr.rule_id = tcru.id AND tcr.contract_id = #{contractId}
- WHERE
- tcru.deleted = 0 AND tcr.deleted = 0
- </select>
+
</mapper>
--
Gitblit v1.8.0