From 90276a76b56cc1e744f7fa68ce921a28a8a9c92f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 一月 2025 11:52:10 +0800
Subject: [PATCH] 运行监控报表导出时间少一天问题
---
ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml | 17 ++++++++++++++---
1 files changed, 14 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..91e239e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
@@ -15,18 +15,21 @@
<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.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>
<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 +39,12 @@
order by create_time desc
</select>
+ <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 and tcr.deleted =0
+ <where>
+ tc.deleted =0 and #{date} between tc.start_time and tc.end_time
+ </where>
+ </select>
</mapper>
--
Gitblit v1.8.0