From c697e0a7466b64855f5f799a1fbf7d97a3b8ed49 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 15 八月 2024 10:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml | 30 +++++++++++++++++++++++++++---
1 files changed, 27 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 4e2abe7..eec44b2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
@@ -7,9 +7,33 @@
<select id="selectAll" resultType="com.ycl.platform.domain.entity.TContract">
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'
- where a.deleted = '0'
+ left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0
+ where a.deleted = 0
order by create_time desc
</select>
-</mapper>
\ No newline at end of file
+ <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
+ where a.deleted = 0
+ <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()
+ </when>
+ <when test="query.status == 'NOT_START'">
+ and a.start_time > sysdate()
+ </when>
+ <when test="query.status == 'FINISHED'">
+ and a.end_time < sysdate()
+ </when>
+ </choose>
+ </if>
+ order by create_time desc
+ </select>
+
+</mapper>
--
Gitblit v1.8.0