From d1b7fd85615a78a476650e5acfc8b165a5deb3aa Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 11:41:05 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml
index 461a973..022b72e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml
@@ -6,6 +6,7 @@
<id column="sub_id" property="id" jdbcType="BIGINT"/>
<result column="sub_name" property="name" jdbcType="VARCHAR"/>
<result column="sub_picture" property="picture" jdbcType="VARCHAR"/>
+ <result column="sub_picture_second" property="pictureSecond" jdbcType="VARCHAR"/>
<result column="sub_weight" property="weight" jdbcType="INTEGER"/>
<result column="sub_level" property="level" jdbcType="INTEGER"/>
<result column="sub_state" property="state" jdbcType="INTEGER"/>
@@ -30,6 +31,7 @@
<id column="sub_id" property="id" jdbcType="BIGINT"/>
<result column="sub_name" property="name" jdbcType="VARCHAR"/>
<result column="sub_picture" property="picture" jdbcType="VARCHAR"/>
+ <result column="sub_picture_second" property="pictureSecond" jdbcType="VARCHAR"/>
<result column="sub_weight" property="weight" jdbcType="INTEGER"/>
<result column="sub_level" property="level" jdbcType="INTEGER"/>
<result column="sub_state" property="state" jdbcType="INTEGER"/>
@@ -51,17 +53,18 @@
</resultMap>
- <sql id="Base_Column_List">sub_id,sub_name,sub_picture,sub_weight,sub_root_id,sub_pid,sub_level,sub_state,sub_key,sub_search_json,sub_ios_click,sub_android_click,sub_createtime,sub_updatetime</sql>
+ <sql id="Base_Column_List">sub_id,sub_name,sub_picture,sub_picture_second,sub_weight,sub_root_id,sub_pid,sub_level,sub_state,sub_key,sub_search_json,sub_ios_click,sub_android_click,sub_createtime,sub_updatetime</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
<include refid="Base_Column_List"/>from yeshi_ec_sub_class where sub_id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_sub_class where sub_id = #{id,jdbcType=BIGINT}</delete>
- <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_sub_class (sub_id,sub_name,sub_picture,sub_weight,sub_root_id,sub_pid,sub_level,sub_state,sub_key,sub_search_json,sub_ios_click,sub_android_click,sub_createtime,sub_updatetime) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{weight,jdbcType=INTEGER},#{rootClass.id,jdbcType=BIGINT},#{parent.id,jdbcType=BIGINT},#{level,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{key,jdbcType=VARCHAR},#{searchJson,jdbcType=VARCHAR},#{iosClick,jdbcType=BIGINT},#{androidClick,jdbcType=BIGINT},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_sub_class (sub_id,sub_name,sub_picture,sub_picture_second,sub_weight,sub_root_id,sub_pid,sub_level,sub_state,sub_key,sub_search_json,sub_ios_click,sub_android_click,sub_createtime,sub_updatetime) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{pictureSecond,jdbcType=VARCHAR},#{weight,jdbcType=INTEGER},#{rootClass.id,jdbcType=BIGINT},#{parent.id,jdbcType=BIGINT},#{level,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{key,jdbcType=VARCHAR},#{searchJson,jdbcType=VARCHAR},#{iosClick,jdbcType=BIGINT},#{androidClick,jdbcType=BIGINT},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_sub_class
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">sub_id,</if>
<if test="name != null">sub_name,</if>
<if test="picture != null">sub_picture,</if>
+ <if test="pictureSecond != null">sub_picture_second,</if>
<if test="weight != null">sub_weight,</if>
<if test="rootClass != null">sub_root_id,</if>
<if test="parent != null">sub_pid,</if>
@@ -78,6 +81,7 @@
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="name != null">#{name,jdbcType=VARCHAR},</if>
<if test="picture != null">#{picture,jdbcType=VARCHAR},</if>
+ <if test="pictureSecond != null">#{pictureSecond,jdbcType=VARCHAR},</if>
<if test="weight != null">#{weight,jdbcType=INTEGER},</if>
<if test="rootClass != null">#{rootClass.id,jdbcType=BIGINT},</if>
<if test="parent != null">#{parent.id,jdbcType=BIGINT},</if>
@@ -91,11 +95,12 @@
<if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>
</trim>
</insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass">update yeshi_ec_sub_class set sub_name = #{name,jdbcType=VARCHAR},sub_picture = #{picture,jdbcType=VARCHAR},sub_weight = #{weight,jdbcType=INTEGER},sub_root_id = #{rootClass.id,jdbcType=BIGINT},sub_pid = #{parent.id,jdbcType=BIGINT},sub_level = #{level,jdbcType=INTEGER},sub_state = #{state,jdbcType=INTEGER}, sub_key = #{key,jdbcType=VARCHAR},sub_search_json = #{searchJson,jdbcType=VARCHAR},sub_ios_click = #{iosClick,jdbcType=BIGINT},sub_android_click = #{androidClick,jdbcType=BIGINT},sub_createtime = #{createtime,jdbcType=TIMESTAMP},sub_updatetime = #{updatetime,jdbcType=TIMESTAMP} where sub_id = #{id,jdbcType=BIGINT}</update>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass">update yeshi_ec_sub_class set sub_name = #{name,jdbcType=VARCHAR},sub_picture = #{picture,jdbcType=VARCHAR},sub_picture_second = #{pictureSecond,jdbcType=VARCHAR},sub_weight = #{weight,jdbcType=INTEGER},sub_root_id = #{rootClass.id,jdbcType=BIGINT},sub_pid = #{parent.id,jdbcType=BIGINT},sub_level = #{level,jdbcType=INTEGER},sub_state = #{state,jdbcType=INTEGER}, sub_key = #{key,jdbcType=VARCHAR},sub_search_json = #{searchJson,jdbcType=VARCHAR},sub_ios_click = #{iosClick,jdbcType=BIGINT},sub_android_click = #{androidClick,jdbcType=BIGINT},sub_createtime = #{createtime,jdbcType=TIMESTAMP},sub_updatetime = #{updatetime,jdbcType=TIMESTAMP} where sub_id = #{id,jdbcType=BIGINT}</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass">update yeshi_ec_sub_class
<set>
<if test="name != null">sub_name=#{name,jdbcType=VARCHAR},</if>
<if test="picture != null">sub_picture=#{picture,jdbcType=VARCHAR},</if>
+ <if test="pictureSecond != null">sub_picture_second=#{pictureSecond,jdbcType=VARCHAR},</if>
<if test="weight != null">sub_weight=#{weight,jdbcType=INTEGER},</if>
<if test="rootClass != null">sub_root_id=#{rootClass.id,jdbcType=BIGINT},</if>
<if test="parent != null">sub_pid=#{parent.id,jdbcType=BIGINT},</if>
@@ -185,7 +190,7 @@
<select id="queryByListCid" resultMap="SimpleResultMap">
SELECT * FROM yeshi_ec_sub_class
- WHERE sub_root_id in
+ WHERE sub_state = 1 AND sub_root_id in
<foreach collection="list" index="index" item="item" separator="," open="(" close=")">
${item}
</foreach>
--
Gitblit v1.8.0