From 1e17cb5f4890dabbb23966a4a48ea921411fe811 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 16:38:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
index b2ff105..215d217 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
@@ -36,19 +36,12 @@
order by create_time desc
</select>
- <select id="selectByRuleName" resultType="com.ycl.platform.domain.vo.CalculateRuleVO">
+ <select id="getCalculateRule" resultType="com.ycl.platform.domain.vo.CalculateRuleVO">
select tc.unit_id ,tcr.*
from t_contract tc
left join t_calculate_rule tcr on tc.id = tcr.contract_id
<where>
tc.deleted =0 and #{date} between tc.start_time and tc.end_time
- <if test="ruleName !=null and ruleName!=''">
- and tcr.rule_name = #{ruleName}
- </if>
- <if test="ruleCondition !=null and ruleCondition!=''">
- and tcr.rule_condition = #{ruleCondition}
- </if>
</where>
-
</select>
</mapper>
--
Gitblit v1.8.0