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/CalculateRuleMapper.xml | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
index ec90956..0f13084 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
@@ -35,6 +35,23 @@
where id = #{id}
</select>
+ <select id="getRuleListByUnitId" resultType="com.ycl.platform.domain.vo.CalculateRuleCascaderVO">
+ <![CDATA[
+ select id,
+ rule_name,
+ deduct_category,
+ calc_fraction,
+ calc_unit,
+ id as value,
+ contract_id,
+ rule_condition as label
+ from t_calculate_rule
+ where deleted = 0
+ and contract_id
+ in (select id from t_contract where unit_id = #{unitId} and deleted = 0 and start_time <= #{now} and end_time >= #{now})
+ ]]>
+ </select>
+
<insert id="insertDefaultRule" useGeneratedKeys="true" keyProperty="id">
insert into t_calculate_rule
<trim prefix="(" suffix=")" suffixOverrides=",">
--
Gitblit v1.8.0