From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1

---
 fanli/src/main/java/com/yeshi/fanli/mapping/help/AppPageNotificationMapper.xml |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/help/AppPageNotificationMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/help/AppPageNotificationMapper.xml
index 6022093..79e2316 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/help/AppPageNotificationMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/help/AppPageNotificationMapper.xml
@@ -96,4 +96,42 @@
 		</set>
 		where an_id = #{id,jdbcType=BIGINT}
 	</update>
+	
+	
+	<select id="listQuery" resultMap="BaseResultMap">
+	    SELECT <include refid="Base_Column_List" />  FROM yeshi_ec_apppage_notification
+	    WHERE 1=1
+		   <if test='key != null and key != ""'>
+		   	   AND (an_type like '%${key}%' or an_content like '%${key}%') 
+		   </if>
+		   <if test='show != null'>
+		   	   AND an_show = #{show}
+		   </if>
+		   <if test='canClose != null'>
+		   	   AND an_can_close = #{canClose}
+		   </if>
+   		ORDER BY an_createtime desc
+    	LIMIT ${start},${count}
+   </select>
+   
+   <select id="countQuery" resultType="java.lang.Long">
+	    SELECT IFNULL(count(an_id),0)  FROM yeshi_ec_apppage_notification 
+	    WHERE 1=1
+		    <if test='key != null and key != ""'>
+		   	   AND (an_type like '%${key}%' or an_content like '%${key}%') 
+		   </if>
+		   <if test='show != null'>
+		   	   AND an_show = #{show}
+		   </if>
+		   <if test='canClose != null'>
+		   	   AND an_can_close = #{canClose}
+		   </if>
+	</select>
+  	
+  	<delete id="deleteBatchByPrimaryKey" parameterType="java.util.List">
+		delete from yeshi_ec_apppage_notification WHERE an_id in
+		<foreach collection="list" item="item" open="(" close=")"
+			separator=",">#{item}</foreach>
+    </delete>
+	
 </mapper>

--
Gitblit v1.8.0