From d6e5a42f021b5e2612f970da21cccf386a4e6640 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 18:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
index 7c796e6..1620c03 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
@@ -17,6 +17,9 @@
from t_contract a
left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0
where a.deleted = 0
+ <if test="query.unitId != null">
+ and a.unit_id = #{query.unitId}
+ </if>
<if test="query.name != null and query.name != ''">
and a.name like concat('%', #{query.name}, '%')
</if>
@@ -36,19 +39,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 #{time} between tc.start_time and tc.end_time
- <if test="ruleName !=null and ruleName!=''">
- tcr.rule_name = #{ruleName}
- </if>
- <if test="ruleCondition !=null and ruleCondition!=''">
- tcr.rule_condition = #{ruleCondition}
- </if>
+ tc.deleted =0 and #{date} between tc.start_time and tc.end_time
</where>
-
</select>
</mapper>
--
Gitblit v1.8.0