From 0b061b77fe806959c70a27dd99b0a3b35928ec62 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 29 七月 2024 10:20:09 +0800
Subject: [PATCH] feign完善，异常解码器
---
ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
index f22190c..5ec3a0d 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
@@ -41,12 +41,13 @@
calc_fraction,
calc_unit,
id as value,
+ contract_id,
if(rule_condition is not null, rule_condition, if(rule_desc is not null, rule_desc, rule_name)) as label,
parent_id
from t_calculate_rule
where deleted = 0
and contract_id
- in (select id from t_contract where unit_id = #{unitId})
+ in (select id from t_contract where unit_id = #{unitId} and deleted = 0 and start_time <![CDATA[ <= ]]> #{now} and end_time >= #{now} )
</select>
<insert id="insertDefaultRule" useGeneratedKeys="true" keyProperty="id">
--
Gitblit v1.8.0