From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化

---
 fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SwiperPictureMapper.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SwiperPictureMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SwiperPictureMapper.xml
index 07422b1..9eb213d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SwiperPictureMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SwiperPictureMapper.xml
@@ -21,13 +21,14 @@
 		<result column="pic_updatetime" property="updatetime" jdbcType="TIMESTAMP" />
 		<result column="pic_title" property="title" jdbcType="VARCHAR" />
 		<result column="pic_desc" property="desc" jdbcType="VARCHAR" />
+		<result column="pic_system" property="system" jdbcType="VARCHAR" />
 			
 		<association property="jumpDetail" column="pic_jumpid"
 			select="com.yeshi.fanli.dao.mybatis.common.JumpDetailV2Mapper.selectByPrimaryKey">
 		</association>
 
 	</resultMap>
-	<sql id="Base_Column_List">pic_id,pic_banner_id,pic_src,pic_jumpid,pic_params,pic_jump_need_login,pic_order,pic_remark,pic_state,pic_auto_control,pic_start_time,pic_end_time,pic_createtime,pic_updatetime,pic_title,pic_desc
+	<sql id="Base_Column_List">pic_id,pic_banner_id,pic_src,pic_jumpid,pic_params,pic_jump_need_login,pic_order,pic_remark,pic_state,pic_auto_control,pic_start_time,pic_end_time,pic_createtime,pic_updatetime,pic_title,pic_desc,pic_system
 	</sql>
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
 		parameterType="java.lang.Long">
@@ -42,9 +43,9 @@
 	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture"
 		useGeneratedKeys="true" keyProperty="id">insert into
 		yeshi_ec_swiper_banner_picture
-		(pic_id,pic_banner_id,pic_src,pic_jumpid,pic_params,pic_jump_need_login,pic_order,pic_remark,pic_state,pic_auto_control,pic_start_time,pic_end_time,pic_createtime,pic_updatetime,pic_title,pic_desc)
+		(pic_id,pic_banner_id,pic_src,pic_jumpid,pic_params,pic_jump_need_login,pic_order,pic_remark,pic_state,pic_auto_control,pic_start_time,pic_end_time,pic_createtime,pic_updatetime,pic_title,pic_desc,pic_system)
 		values
-		(#{id,jdbcType=BIGINT},#{bannerId,jdbcType=BIGINT},#{src,jdbcType=VARCHAR},#{jumpDetail.id,jdbcType=BIGINT},#{params,jdbcType=VARCHAR},#{jumpNeedLogin,jdbcType=VARCHAR},#{order,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{autoControl,jdbcType=INTEGER},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP},#{title,jdbcType=VARCHAR},#{desc,jdbcType=VARCHAR})
+		(#{id,jdbcType=BIGINT},#{bannerId,jdbcType=BIGINT},#{src,jdbcType=VARCHAR},#{jumpDetail.id,jdbcType=BIGINT},#{params,jdbcType=VARCHAR},#{jumpNeedLogin,jdbcType=VARCHAR},#{order,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{autoControl,jdbcType=INTEGER},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP},#{title,jdbcType=VARCHAR},#{desc,jdbcType=VARCHAR},#{system,jdbcType=VARCHAR})
 	</insert>
 	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture"
 		useGeneratedKeys="true" keyProperty="id">
@@ -66,6 +67,7 @@
 			<if test="updatetime != null">pic_updatetime,</if>
 			<if test="title != null">pic_title,</if>
 			<if test="desc != null">pic_desc,</if>
+			<if test="system != null">pic_system,</if>
 		</trim>
 		values
 		<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -85,6 +87,7 @@
 			<if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>
 			<if test="title != null">#{title,jdbcType=VARCHAR},</if>
 			<if test="desc != null">#{desc,jdbcType=VARCHAR},</if>
+			<if test="system != null">#{system,jdbcType=VARCHAR},</if>
 		</trim>
 	</insert>
 	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture">update
@@ -102,7 +105,7 @@
 		#{endTime,jdbcType=TIMESTAMP},pic_createtime =
 		#{createtime,jdbcType=TIMESTAMP},pic_updatetime =
 		#{updatetime,jdbcType=TIMESTAMP} ,pic_title =#{title,jdbcType=VARCHAR}
-		,pic_desc =#{desc,jdbcType=VARCHAR} where pic_id =
+		,pic_desc =#{desc,jdbcType=VARCHAR},pic_system =#{system,jdbcType=VARCHAR} where pic_id =
 		#{id,jdbcType=BIGINT}</update>
 	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.SwiperPicture">
 		update yeshi_ec_swiper_banner_picture
@@ -123,6 +126,7 @@
 			<if test="updatetime != null">pic_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>
 			<if test="title !=null">pic_title =#{title,jdbcType=VARCHAR},</if>
 			<if test="desc !=null">pic_desc =#{desc,jdbcType=VARCHAR},</if>
+			<if test="system !=null">pic_system =#{system,jdbcType=VARCHAR},</if>
 		</set>
 		where pic_id = #{id,jdbcType=BIGINT}
 	</update>
@@ -176,7 +180,7 @@
 	<select id="getByBannerCard" resultMap="BaseResultMap">SELECT
 		* FROM `yeshi_ec_swiper_banner` w LEFT JOIN
 		`yeshi_ec_swiper_banner_picture` p ON p.`pic_banner_id` = w.`sp_id`
-		WHERE w.`sp_card` = #{card} AND w.`sp_state` = 0 AND
+		WHERE w.`sp_card` = #{card} AND w.`sp_state` = 0 AND  pic_system=#{system} AND
 		p.`pic_state`= 0<![CDATA[AND IF(p.`pic_auto_control` = 1, p.`pic_start_time` <= NOW() AND p.`pic_end_time` >= NOW(),TRUE)]]>
 		ORDER BY p.`pic_order`
 	</select>

--
Gitblit v1.8.0