Commit 94c05fba authored by 刘帅阳's avatar 刘帅阳

修改

parent 20bdf591
...@@ -169,6 +169,7 @@ ...@@ -169,6 +169,7 @@
SELECT * SELECT *
FROM (SELECT cpc.business_id, FROM (SELECT cpc.business_id,
cpc.news_video_id, cpc.news_video_id,
cpc.update_date,
cn.title AS title, cn.title AS title,
sun.business_id AS unitId, sun.business_id AS unitId,
sun.unit_name AS unitName, sun.unit_name AS unitName,
...@@ -191,6 +192,7 @@ ...@@ -191,6 +192,7 @@
UNION ALL UNION ALL
SELECT cpc.business_id, SELECT cpc.business_id,
cpc.news_video_id, cpc.news_video_id,
cpc.update_date,
cv.video_title AS title, cv.video_title AS title,
sun.business_id AS unitId, sun.business_id AS unitId,
sun.unit_name AS unitName, sun.unit_name AS unitName,
...@@ -221,6 +223,10 @@ ...@@ -221,6 +223,10 @@
<if test="entity.newsVideoId !=null and entity.newsVideoId != '' "> <if test="entity.newsVideoId !=null and entity.newsVideoId != '' ">
AND combined_results.news_video_id = #{entity.newsVideoId} AND combined_results.news_video_id = #{entity.newsVideoId}
</if> </if>
<if test="entity.startTime !=null and entity.startTime != '' and entity.endTime !=null and entity.endTime != '' ">
AND combined_results.update_date >= #{entity.startTime}
AND combined_results.update_date &lt;= #{entity.endTime}
</if>
ORDER BY combined_results.business_id DESC ORDER BY combined_results.business_id DESC
</select> </select>
<select id="merchantAdminsPaginateQueries" <select id="merchantAdminsPaginateQueries"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment