From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/ExtractRecordMapper.xml | 164 +++++++++++++++++++++++++++---------------------------
1 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractRecordMapper.xml
index c8c47b1..1ad16e8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractRecordMapper.xml
@@ -1,82 +1,82 @@
-<?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.ExtractRecordMapper">
- <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.ExtractRecord">
- <id column="id" property="id" jdbcType="BIGINT" />
- <result column="count" property="count" jdbcType="INTEGER" />
- <result column="money" property="money" jdbcType="DECIMAL" />
- <result column="createTime" property="createTime" jdbcType="BIGINT" />
- <!-- <result column="uid" property="userInfo"/> -->
- <!-- <association property="userInfo" column="uid" resultMap="com.yeshi.fanli.entity.dao.mybatis.UserInfoMapper.BaseResultMap"/> -->
- </resultMap>
- <sql id="Base_Column_List">id,uid,count,money,createTime</sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap"
- parameterType="java.lang.Long">
- select
- <include refid="Base_Column_List" />
- from yeshi_ec_extract_record where id = #{id,jdbcType=BIGINT}
- </select>
- <select id="selectByUid" resultMap="BaseResultMap"
- parameterType="java.lang.Long">
- select
- <include refid="Base_Column_List" />
- from yeshi_ec_extract_record where uid = #{0}
- </select>
- <select id="selectByUidAndToday" resultMap="BaseResultMap"
- parameterType="java.lang.Long">
- select
- <include refid="Base_Column_List" />
- from yeshi_ec_extract_record er where er.uid = #{0} <![CDATA[
- ANd FROM_UNIXTIME(er.createTime/1000) >= CURDATE()
- ]]>
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
- yeshi_ec_extract_record where id = #{id,jdbcType=BIGINT}
- </delete>
-
- <delete id="deleteAll">delete from
- yeshi_ec_extract_record
- </delete>
-
- <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.ExtractRecord"
- useGeneratedKeys="true" keyProperty="id">insert into
- yeshi_ec_extract_record (id,uid,count,money,createTime,id) values
- (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{count,jdbcType=INTEGER},#{money,jdbcType=DECIMAL},#{createTime,jdbcType=BIGINT},#{id,jdbcType=BIGINT})
- </insert>
- <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.ExtractRecord"
- useGeneratedKeys="true" keyProperty="id">
- insert into yeshi_ec_extract_record
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="userInfo != null">uid,</if>
- <if test="count != null">count,</if>
- <if test="money != null">money,</if>
- <if test="createTime != null">createTime,</if>
- </trim>
- values
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="userInfo != null">#{userInfo.id,jdbcType=BIGINT},</if>
- <if test="count != null">#{count,jdbcType=INTEGER},</if>
- <if test="money != null">#{money,jdbcType=DECIMAL},</if>
- <if test="createTime != null">#{createTime,jdbcType=BIGINT}</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.ExtractRecord">update
- yeshi_ec_extract_record set uid = #{userInfo.id,jdbcType=BIGINT},count
- = #{count,jdbcType=INTEGER},money = #{money,jdbcType=DECIMAL}
- ,createTime =#{createTime,jdbcType=BIGINT} where id =
- #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.ExtractRecord">
- update yeshi_ec_extract_record
- <set>
- <if test="userInfo != null">uid=#{userInfo.id,jdbcType=BIGINT},</if>
- <if test="count != null">count=#{count,jdbcType=INTEGER},</if>
- <if test="money != null">money=#{money,jdbcType=DECIMAL},</if>
- <if test="createTime !=null">createTime =#{createTime,jdbcType=BIGINT},</if>
- </set>
- where 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.ExtractRecordMapper">
+ <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.ExtractRecord">
+ <id column="id" property="id" jdbcType="BIGINT" />
+ <result column="count" property="count" jdbcType="INTEGER" />
+ <result column="money" property="money" jdbcType="DECIMAL" />
+ <result column="createTime" property="createTime" jdbcType="BIGINT" />
+ <!-- <result column="uid" property="userInfo"/> -->
+ <!-- <association property="userInfo" column="uid" resultMap="com.yeshi.fanli.entity.dao.mybatis.UserInfoMapper.BaseResultMap"/> -->
+ </resultMap>
+ <sql id="Base_Column_List">id,uid,count,money,createTime</sql>
+ <select id="selectByPrimaryKey" resultMap="BaseResultMap"
+ parameterType="java.lang.Long">
+ select
+ <include refid="Base_Column_List" />
+ from yeshi_ec_extract_record where id = #{id,jdbcType=BIGINT}
+ </select>
+ <select id="selectByUid" resultMap="BaseResultMap"
+ parameterType="java.lang.Long">
+ select
+ <include refid="Base_Column_List" />
+ from yeshi_ec_extract_record where uid = #{0}
+ </select>
+ <select id="selectByUidAndToday" resultMap="BaseResultMap"
+ parameterType="java.lang.Long">
+ select
+ <include refid="Base_Column_List" />
+ from yeshi_ec_extract_record er where er.uid = #{0} <![CDATA[
+ ANd FROM_UNIXTIME(er.createTime/1000) >= CURDATE()
+ ]]>
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+ yeshi_ec_extract_record where id = #{id,jdbcType=BIGINT}
+ </delete>
+
+ <delete id="deleteAll">delete from
+ yeshi_ec_extract_record
+ </delete>
+
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.ExtractRecord"
+ useGeneratedKeys="true" keyProperty="id">insert into
+ yeshi_ec_extract_record (id,uid,count,money,createTime,id) values
+ (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{count,jdbcType=INTEGER},#{money,jdbcType=DECIMAL},#{createTime,jdbcType=BIGINT},#{id,jdbcType=BIGINT})
+ </insert>
+ <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.ExtractRecord"
+ useGeneratedKeys="true" keyProperty="id">
+ insert into yeshi_ec_extract_record
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="userInfo != null">uid,</if>
+ <if test="count != null">count,</if>
+ <if test="money != null">money,</if>
+ <if test="createTime != null">createTime,</if>
+ </trim>
+ values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="userInfo != null">#{userInfo.id,jdbcType=BIGINT},</if>
+ <if test="count != null">#{count,jdbcType=INTEGER},</if>
+ <if test="money != null">#{money,jdbcType=DECIMAL},</if>
+ <if test="createTime != null">#{createTime,jdbcType=BIGINT}</if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.ExtractRecord">update
+ yeshi_ec_extract_record set uid = #{userInfo.id,jdbcType=BIGINT},count
+ = #{count,jdbcType=INTEGER},money = #{money,jdbcType=DECIMAL}
+ ,createTime =#{createTime,jdbcType=BIGINT} where id =
+ #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.ExtractRecord">
+ update yeshi_ec_extract_record
+ <set>
+ <if test="userInfo != null">uid=#{userInfo.id,jdbcType=BIGINT},</if>
+ <if test="count != null">count=#{count,jdbcType=INTEGER},</if>
+ <if test="money != null">money=#{money,jdbcType=DECIMAL},</if>
+ <if test="createTime !=null">createTime =#{createTime,jdbcType=BIGINT},</if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+</mapper>
--
Gitblit v1.8.0