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/integral/IntegralTaskRankMapper.xml |  114 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRankMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRankMapper.xml
index be40b9d..274ba93 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRankMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRankMapper.xml
@@ -1,57 +1,57 @@
-<?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.integral.IntegralTaskRankMapper">
-  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.integral.IntegralTaskRank">
-    <id column="tr_id" property="id" jdbcType="BIGINT"/>
-    <result column="tr_task_id" property="taskId" jdbcType="BIGINT"/>
-    <result column="tr_rank_id" property="rankId" jdbcType="BIGINT"/>
-    <result column="tr_add_coin" property="addCoin" jdbcType="INTEGER"/>
-    <result column="tr_double_num" property="doubleNum" jdbcType="INTEGER"/>
-    <result column="tr_create_time" property="createTime" jdbcType="TIMESTAMP"/>
-    <result column="tr_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-  </resultMap>
-  <sql id="Base_Column_List">tr_id,tr_task_id,tr_rank_id,tr_add_coin,tr_double_num,tr_create_time,tr_update_time</sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
-    <include refid="Base_Column_List"/>from yeshi_ec_integral_task_rank where tr_id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_integral_task_rank where tr_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRank" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_integral_task_rank (tr_id,tr_task_id,tr_rank_id,tr_add_coin,tr_double_num,tr_create_time,tr_update_time) values (#{id,jdbcType=BIGINT},#{taskId,jdbcType=BIGINT},#{rankId,jdbcType=BIGINT},#{addCoin,jdbcType=INTEGER},#{doubleNum,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
-  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRank" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_integral_task_rank
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">tr_id,</if>
-      <if test="taskId != null">tr_task_id,</if>
-      <if test="rankId != null">tr_rank_id,</if>
-      <if test="addCoin != null">tr_add_coin,</if>
-      <if test="doubleNum != null">tr_double_num,</if>
-      <if test="createTime != null">tr_create_time,</if>
-      <if test="updateTime != null">tr_update_time,</if>
-    </trim>values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">#{id,jdbcType=BIGINT},</if>
-      <if test="taskId != null">#{taskId,jdbcType=BIGINT},</if>
-      <if test="rankId != null">#{rankId,jdbcType=BIGINT},</if>
-      <if test="addCoin != null">#{addCoin,jdbcType=INTEGER},</if>
-      <if test="doubleNum != null">#{doubleNum,jdbcType=INTEGER},</if>
-      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRank">update yeshi_ec_integral_task_rank set tr_task_id = #{taskId,jdbcType=BIGINT},tr_rank_id = #{rankId,jdbcType=BIGINT},tr_add_coin = #{addCoin,jdbcType=INTEGER},tr_double_num = #{doubleNum,jdbcType=INTEGER},tr_create_time = #{createTime,jdbcType=TIMESTAMP},tr_update_time = #{updateTime,jdbcType=TIMESTAMP} where tr_id = #{id,jdbcType=BIGINT}</update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRank">update yeshi_ec_integral_task_rank
-    <set>
-      <if test="taskId != null">tr_task_id=#{taskId,jdbcType=BIGINT},</if>
-      <if test="rankId != null">tr_rank_id=#{rankId,jdbcType=BIGINT},</if>
-      <if test="addCoin != null">tr_add_coin=#{addCoin,jdbcType=INTEGER},</if>
-      <if test="doubleNum != null">tr_double_num=#{doubleNum,jdbcType=INTEGER},</if>
-      <if test="createTime != null">tr_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-      <if test="updateTime != null">tr_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-    </set> where tr_id = #{id,jdbcType=BIGINT}
-  </update>
-  
-   <select id="getByTsakIdAndRankId" resultMap="BaseResultMap">
-  	 SELECT * FROM yeshi_ec_integral_task_rank
-	 WHERE tr_task_id = #{tsakId}  AND  tr_rank_id = #{rankId}
-   	 LIMIT 1
-   </select>
-</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.integral.IntegralTaskRankMapper">
+  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.integral.IntegralTaskRank">
+    <id column="tr_id" property="id" jdbcType="BIGINT"/>
+    <result column="tr_task_id" property="taskId" jdbcType="BIGINT"/>
+    <result column="tr_rank_id" property="rankId" jdbcType="BIGINT"/>
+    <result column="tr_add_coin" property="addCoin" jdbcType="INTEGER"/>
+    <result column="tr_double_num" property="doubleNum" jdbcType="INTEGER"/>
+    <result column="tr_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    <result column="tr_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+  </resultMap>
+  <sql id="Base_Column_List">tr_id,tr_task_id,tr_rank_id,tr_add_coin,tr_double_num,tr_create_time,tr_update_time</sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+    <include refid="Base_Column_List"/>from yeshi_ec_integral_task_rank where tr_id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_integral_task_rank where tr_id = #{id,jdbcType=BIGINT}</delete>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRank" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_integral_task_rank (tr_id,tr_task_id,tr_rank_id,tr_add_coin,tr_double_num,tr_create_time,tr_update_time) values (#{id,jdbcType=BIGINT},#{taskId,jdbcType=BIGINT},#{rankId,jdbcType=BIGINT},#{addCoin,jdbcType=INTEGER},#{doubleNum,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRank" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_integral_task_rank
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">tr_id,</if>
+      <if test="taskId != null">tr_task_id,</if>
+      <if test="rankId != null">tr_rank_id,</if>
+      <if test="addCoin != null">tr_add_coin,</if>
+      <if test="doubleNum != null">tr_double_num,</if>
+      <if test="createTime != null">tr_create_time,</if>
+      <if test="updateTime != null">tr_update_time,</if>
+    </trim>values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">#{id,jdbcType=BIGINT},</if>
+      <if test="taskId != null">#{taskId,jdbcType=BIGINT},</if>
+      <if test="rankId != null">#{rankId,jdbcType=BIGINT},</if>
+      <if test="addCoin != null">#{addCoin,jdbcType=INTEGER},</if>
+      <if test="doubleNum != null">#{doubleNum,jdbcType=INTEGER},</if>
+      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRank">update yeshi_ec_integral_task_rank set tr_task_id = #{taskId,jdbcType=BIGINT},tr_rank_id = #{rankId,jdbcType=BIGINT},tr_add_coin = #{addCoin,jdbcType=INTEGER},tr_double_num = #{doubleNum,jdbcType=INTEGER},tr_create_time = #{createTime,jdbcType=TIMESTAMP},tr_update_time = #{updateTime,jdbcType=TIMESTAMP} where tr_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRank">update yeshi_ec_integral_task_rank
+    <set>
+      <if test="taskId != null">tr_task_id=#{taskId,jdbcType=BIGINT},</if>
+      <if test="rankId != null">tr_rank_id=#{rankId,jdbcType=BIGINT},</if>
+      <if test="addCoin != null">tr_add_coin=#{addCoin,jdbcType=INTEGER},</if>
+      <if test="doubleNum != null">tr_double_num=#{doubleNum,jdbcType=INTEGER},</if>
+      <if test="createTime != null">tr_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+      <if test="updateTime != null">tr_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+    </set> where tr_id = #{id,jdbcType=BIGINT}
+  </update>
+  
+   <select id="getByTsakIdAndRankId" resultMap="BaseResultMap">
+  	 SELECT * FROM yeshi_ec_integral_task_rank
+	 WHERE tr_task_id = #{tsakId}  AND  tr_rank_id = #{rankId}
+   	 LIMIT 1
+   </select>
+</mapper>

--
Gitblit v1.8.0