From c5f54810f60e036317562b1b42cfeafd18e984c5 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 01 三月 2020 16:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/activity/ActivityUserMapper.xml | 136 +++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 67 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/activity/ActivityUserMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/activity/ActivityUserMapper.xml
index aa4fc42..0674b4e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/activity/ActivityUserMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/activity/ActivityUserMapper.xml
@@ -1,67 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.yeshi.fanli.dao.mybatis.activity.ActivityUserMapper">
- <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.activity.ActivityUser">
- <id column="au_id" property="id" jdbcType="BIGINT"/>
- <result column="au_nick_name" property="nickName" jdbcType="VARCHAR"/>
- <result column="au_portrait" property="portrait" jdbcType="VARCHAR"/>
- <result column="au_create_time" property="createTime" jdbcType="TIMESTAMP"/>
- <result column="au_tag" property="tag" jdbcType="VARCHAR"/>
- </resultMap>
- <sql id="Base_Column_List">au_id,au_nick_name,au_portrait,au_create_time,au_tag</sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap"
- parameterType="java.lang.Long">
- select
- <include refid="Base_Column_List" />
- from yeshi_ec_activity_user where au_id = #{0}
- </select>
-
- <select id="selectList" resultMap="BaseResultMap" parameterType="java.lang.Long">
- select
- <include refid="Base_Column_List" />
- from yeshi_ec_activity_user
- </select>
-
-
- <select id="listRand" resultMap="BaseResultMap">
- SELECT
- <include refid="Base_Column_List" />
- FROM yeshi_ec_activity_user ORDER BY RAND() LIMIT #{count}
- </select>
-
- <select id="selectByName" resultMap="BaseResultMap" parameterType="java.lang.String">
- SELECT
- <include refid="Base_Column_List" />
- FROM yeshi_ec_activity_user where au_nick_name=#{0}
- </select>
-
-
-
- <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_activity_user (au_id,au_nick_name,au_portrait,au_create_time,au_tag) values (#{id,jdbcType=BIGINT},#{nickName,jdbcType=VARCHAR},#{portrait,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{tag,jdbcType=VARCHAR})</insert>
- <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_activity_user
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">au_id,</if>
- <if test="nickName != null">au_nick_name,</if>
- <if test="portrait != null">au_portrait,</if>
- <if test="createTime != null">au_create_time,</if>
- <if test="tag != null">au_tag,</if>
- </trim>values
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="nickName != null">#{nickName,jdbcType=VARCHAR},</if>
- <if test="portrait != null">#{portrait,jdbcType=VARCHAR},</if>
- <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
- <if test="tag != null">#{tag,jdbcType=VARCHAR},</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser">update yeshi_ec_activity_user set au_nick_name = #{nickName,jdbcType=VARCHAR},au_portrait = #{portrait,jdbcType=VARCHAR},au_create_time = #{createTime,jdbcType=TIMESTAMP},au_tag = #{tag,jdbcType=VARCHAR} where au_id = #{id,jdbcType=BIGINT}</update>
- <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser">update yeshi_ec_activity_user
- <set>
- <if test="nickName != null">au_nick_name=#{nickName,jdbcType=VARCHAR},</if>
- <if test="portrait != null">au_portrait=#{portrait,jdbcType=VARCHAR},</if>
- <if test="createTime != null">au_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
- <if test="tag != null">au_tag=#{tag,jdbcType=VARCHAR},</if>
- </set> where au_id = #{id,jdbcType=BIGINT}
- </update>
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yeshi.fanli.dao.mybatis.activity.ActivityUserMapper">
+ <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.activity.ActivityUser">
+ <id column="au_id" property="id" jdbcType="BIGINT"/>
+ <result column="au_nick_name" property="nickName" jdbcType="VARCHAR"/>
+ <result column="au_portrait" property="portrait" jdbcType="VARCHAR"/>
+ <result column="au_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+ <result column="au_tag" property="tag" jdbcType="VARCHAR"/>
+ </resultMap>
+ <sql id="Base_Column_List">au_id,au_nick_name,au_portrait,au_create_time,au_tag</sql>
+ <select id="selectByPrimaryKey" resultMap="BaseResultMap"
+ parameterType="java.lang.Long">
+ select
+ <include refid="Base_Column_List" />
+ from yeshi_ec_activity_user where au_id = #{0}
+ </select>
+
+ <select id="selectList" resultMap="BaseResultMap" parameterType="java.lang.Long">
+ select
+ <include refid="Base_Column_List" />
+ from yeshi_ec_activity_user
+ </select>
+
+
+ <select id="listRand" resultMap="BaseResultMap">
+ SELECT
+ <include refid="Base_Column_List" />
+ FROM yeshi_ec_activity_user ORDER BY RAND() LIMIT #{count}
+ </select>
+
+ <select id="selectByName" resultMap="BaseResultMap" parameterType="java.lang.String">
+ SELECT
+ <include refid="Base_Column_List" />
+ FROM yeshi_ec_activity_user where au_nick_name=#{0}
+ ORDER BY au_id DESC
+ LIMIT 1
+ </select>
+
+
+
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_activity_user (au_id,au_nick_name,au_portrait,au_create_time,au_tag) values (#{id,jdbcType=BIGINT},#{nickName,jdbcType=VARCHAR},#{portrait,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{tag,jdbcType=VARCHAR})</insert>
+ <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_activity_user
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">au_id,</if>
+ <if test="nickName != null">au_nick_name,</if>
+ <if test="portrait != null">au_portrait,</if>
+ <if test="createTime != null">au_create_time,</if>
+ <if test="tag != null">au_tag,</if>
+ </trim>values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="nickName != null">#{nickName,jdbcType=VARCHAR},</if>
+ <if test="portrait != null">#{portrait,jdbcType=VARCHAR},</if>
+ <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+ <if test="tag != null">#{tag,jdbcType=VARCHAR},</if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser">update yeshi_ec_activity_user set au_nick_name = #{nickName,jdbcType=VARCHAR},au_portrait = #{portrait,jdbcType=VARCHAR},au_create_time = #{createTime,jdbcType=TIMESTAMP},au_tag = #{tag,jdbcType=VARCHAR} where au_id = #{id,jdbcType=BIGINT}</update>
+ <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser">update yeshi_ec_activity_user
+ <set>
+ <if test="nickName != null">au_nick_name=#{nickName,jdbcType=VARCHAR},</if>
+ <if test="portrait != null">au_portrait=#{portrait,jdbcType=VARCHAR},</if>
+ <if test="createTime != null">au_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+ <if test="tag != null">au_tag=#{tag,jdbcType=VARCHAR},</if>
+ </set> where au_id = #{id,jdbcType=BIGINT}
+ </update>
+</mapper>
--
Gitblit v1.8.0