From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdvertisementMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdvertisementMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdvertisementMapper.xml
index ec0f857..8d8d485 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdvertisementMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdvertisementMapper.xml
@@ -29,7 +29,7 @@
SELECT * FROM (SELECT rr.chineseName as provinceName,aa.* FROM t_advertisement as aa
LEFT JOIN t_city as rr on rr.id = aa.cityId) as o
<where>
- 1=1
+ type in (1, 2)
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
@@ -43,4 +43,14 @@
order by o.id desc
</select>
+ <select id="getAdvertisementList1" resultType="java.util.Map">
+ SELECT * FROM (SELECT rr.chineseName as provinceName,aa.* FROM t_advertisement as aa
+ LEFT JOIN t_city as rr on rr.id = aa.cityId) as o where o.type=3 order by o.id desc
+ </select>
+
+ <select id="getAdvertisementList2" resultType="java.util.Map">
+ SELECT * FROM (SELECT rr.chineseName as provinceName,aa.* FROM t_advertisement as aa
+ LEFT JOIN t_city as rr on rr.id = aa.cityId) as o where o.type=4 order by o.id desc
+
+ </select>
</mapper>
--
Gitblit v1.7.1