From 9da24a8dfa3766cec565b092fc105f7f006de070 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 11:52:25 +0800
Subject: [PATCH] 合同考核点位在线率记录
---
ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
index eec44b2..7c796e6 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
@@ -15,7 +15,7 @@
<select id="getPage" resultType="com.ycl.platform.domain.vo.ContractVO">
select a.*, b.unit_name
from t_contract a
- left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0
+ left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0
where a.deleted = 0
<if test="query.name != null and query.name != ''">
and a.name like concat('%', #{query.name}, '%')
@@ -23,10 +23,10 @@
<if test="query.status != null and query.status != ''">
<choose>
<when test="query.status == 'ACTIVE'">
- and a.start_time < sysdate() and a.end_time > sysdate()
+ and a.start_time < sysdate() and a.end_time > sysdate()
</when>
<when test="query.status == 'NOT_START'">
- and a.start_time > sysdate()
+ and a.start_time > sysdate()
</when>
<when test="query.status == 'FINISHED'">
and a.end_time < sysdate()
@@ -36,4 +36,19 @@
order by create_time desc
</select>
+ <select id="selectByRuleName" 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>
+ </where>
+
+ </select>
</mapper>
--
Gitblit v1.8.0