From 437ceb214daff5a57253a59a2d8065a088173514 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 13 四月 2020 09:42:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/mapping/user/vip/TeamUserLevelStatisticMapper.xml | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/vip/TeamUserLevelStatisticMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/vip/TeamUserLevelStatisticMapper.xml index c945e23..2dc1fc8 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/vip/TeamUserLevelStatisticMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/vip/TeamUserLevelStatisticMapper.xml @@ -27,8 +27,12 @@ jdbcType="INTEGER" /> <result column="tuls_tearcher_second_count" property="tearcherSecondCount" jdbcType="INTEGER" /> + <result column="tuls_daren_first_count" property="daRenFirstCount" + jdbcType="INTEGER" /> + <result column="tuls_daren_second_count" property="daRenSecondCount" + jdbcType="INTEGER" /> </resultMap> - <sql id="Base_Column_List">tuls_uid,tuls_level,tuls_normal_first_count,tuls_normal_second_count,tuls_high_first_count,tuls_high_second_count,tuls_super_first_count,tuls_super_second_count,tuls_create_time,tuls_update_time,tuls_tearcher_first_count,tuls_tearcher_second_count + <sql id="Base_Column_List">tuls_uid,tuls_level,tuls_normal_first_count,tuls_normal_second_count,tuls_high_first_count,tuls_high_second_count,tuls_super_first_count,tuls_super_second_count,tuls_create_time,tuls_update_time,tuls_tearcher_first_count,tuls_tearcher_second_count,tuls_daren_first_count,tuls_daren_second_count </sql> <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long"> @@ -39,14 +43,15 @@ </select> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_team_user_level_statistic where tuls_uid = - #{id,jdbcType=BIGINT}</delete> + #{id,jdbcType=BIGINT} + </delete> <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_team_user_level_statistic - (tuls_uid,tuls_level,tuls_normal_first_count,tuls_normal_second_count,tuls_high_first_count,tuls_high_second_count,tuls_super_first_count,tuls_super_second_count,tuls_create_time,tuls_update_time,tuls_tearcher_first_count,tuls_tearcher_second_count) + (tuls_uid,tuls_level,tuls_normal_first_count,tuls_normal_second_count,tuls_high_first_count,tuls_high_second_count,tuls_super_first_count,tuls_super_second_count,tuls_create_time,tuls_update_time,tuls_tearcher_first_count,tuls_tearcher_second_count,tuls_daren_first_count,tuls_daren_second_count) values - (#{id,jdbcType=BIGINT},#{level,jdbcType=VARCHAR},#{normalFirstCount,jdbcType=INTEGER},#{normalSecondCount,jdbcType=INTEGER},#{highFirstCount,jdbcType=INTEGER},#{highSecondCount,jdbcType=INTEGER},#{superFirstCount,jdbcType=INTEGER},#{superSecondCount,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{tearcherFirstCount,jdbcType=INTEGER},#{tearcherSecondCount,jdbcType=INTEGER}) + (#{id,jdbcType=BIGINT},#{level,jdbcType=VARCHAR},#{normalFirstCount,jdbcType=INTEGER},#{normalSecondCount,jdbcType=INTEGER},#{highFirstCount,jdbcType=INTEGER},#{highSecondCount,jdbcType=INTEGER},#{superFirstCount,jdbcType=INTEGER},#{superSecondCount,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{tearcherFirstCount,jdbcType=INTEGER},#{tearcherSecondCount,jdbcType=INTEGER},#{daRenFirstCount,jdbcType=INTEGER},#{daRenSecondCount,jdbcType=INTEGER}) </insert> <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic" @@ -65,6 +70,8 @@ <if test="updateTime != null">tuls_update_time,</if> <if test="tearcherFirstCount != null">tuls_tearcher_first_count,</if> <if test="tearcherSecondCount != null">tuls_tearcher_second_count,</if> + <if test="daRenFirstCount != null">tuls_daren_first_count,</if> + <if test="daRenSecondCount != null">tuls_daren_second_count,</if> </trim> values <trim prefix="(" suffix=")" suffixOverrides=","> @@ -79,7 +86,9 @@ <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if> <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if> <if test="tearcherFirstCount != null">#{tearcherFirstCount,jdbcType=INTEGER},</if> - <if test="tearcherSecondCount != null">#{tearcherSecondCount,jdbcType=INTEGER}</if> + <if test="tearcherSecondCount != null">#{tearcherSecondCount,jdbcType=INTEGER},</if> + <if test="daRenFirstCount != null">#{daRenFirstCount,jdbcType=INTEGER},</if> + <if test="daRenSecondCount != null">#{daRenSecondCount,jdbcType=INTEGER},</if> </trim> </insert> <update id="updateByPrimaryKey" @@ -94,8 +103,11 @@ #{createTime,jdbcType=TIMESTAMP},tuls_update_time = #{updateTime,jdbcType=TIMESTAMP} ,tuls_tearcher_first_count =#{tearcherFirstCount,jdbcType=INTEGER} ,tuls_tearcher_second_count - =#{tearcherSecondCount,jdbcType=INTEGER} where tuls_uid = - #{id,jdbcType=BIGINT}</update> + =#{tearcherSecondCount,jdbcType=INTEGER} ,tuls_daren_first_count + =#{daRenFirstCount,jdbcType=INTEGER} ,tuls_daren_second_count + =#{daRenSecondCount,jdbcType=INTEGER} where tuls_uid = + #{id,jdbcType=BIGINT} + </update> <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic"> update yeshi_ec_team_user_level_statistic @@ -116,9 +128,17 @@ <if test="createTime != null">tuls_create_time=#{createTime,jdbcType=TIMESTAMP},</if> <if test="updateTime != null">tuls_update_time=#{updateTime,jdbcType=TIMESTAMP},</if> <if test="tearcherFirstCount !=null">tuls_tearcher_first_count - =#{tearcherFirstCount,jdbcType=INTEGER},</if> + =#{tearcherFirstCount,jdbcType=INTEGER}, + </if> <if test="tearcherSecondCount !=null">tuls_tearcher_second_count - =#{tearcherSecondCount,jdbcType=INTEGER},</if> + =#{tearcherSecondCount,jdbcType=INTEGER}, + </if> + <if test="daRenFirstCount !=null">tuls_daren_first_count + =#{daRenFirstCount,jdbcType=INTEGER}, + </if> + <if test="daRenSecondCount !=null">tuls_daren_second_count + =#{daRenSecondCount,jdbcType=INTEGER}, + </if> </set> where tuls_uid = #{id,jdbcType=BIGINT} </update> -- Gitblit v1.8.0