From 54c250656c2e471ad48ecaa8ccce16ec9d7eb8bd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 03 十二月 2019 13:52:38 +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/CodePublishRecordMapper.xml |  153 +++++++++++++++++++++++++++++++--------------------
 1 files changed, 93 insertions(+), 60 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml
index 984d2a6..c6b7e37 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml
@@ -2,64 +2,97 @@
 <!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.CodePublishRecordMapper">
-  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.integral.CodePublishRecord">
-    <id column="pr_id" property="id" jdbcType="BIGINT"/>
-    <result column="pr_uid" property="uid" jdbcType="BIGINT"/>
-    <result column="pr_create_time" property="createTime" jdbcType="TIMESTAMP"/>
-  </resultMap>
-  
-  <resultMap id="BaseResultVOMap" type="com.yeshi.fanli.entity.integral.CodePublishRecord">
-    <id column="pr_id" property="id" jdbcType="BIGINT"/>
-    <result column="pr_uid" property="uid" jdbcType="BIGINT"/>
-    <result column="pr_create_time" property="createTime" jdbcType="TIMESTAMP"/>
-    <result column="nick_name" property="nickName" jdbcType="VARCHAR"/>
-    <result column="portrait" property="portrait" jdbcType="VARCHAR"/>
-    <result column="uie_invite_code" property="inviteCode" jdbcType="VARCHAR"/>
-  </resultMap>
-  
-  <sql id="Base_Column_List">pr_id,pr_uid,pr_create_time</sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
-    <include refid="Base_Column_List"/>from yeshi_ec_code_publish_record where pr_id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_code_publish_record where pr_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.integral.CodePublishRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_code_publish_record (pr_id,pr_uid,pr_create_time) values (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP})</insert>
-  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.integral.CodePublishRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_code_publish_record
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">pr_id,</if>
-      <if test="uid != null">pr_uid,</if>
-      <if test="createTime != null">pr_create_time,</if>
-    </trim>values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">#{id,jdbcType=BIGINT},</if>
-      <if test="uid != null">#{uid,jdbcType=BIGINT},</if>
-      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.integral.CodePublishRecord">update yeshi_ec_code_publish_record set pr_uid = #{uid,jdbcType=BIGINT},pr_create_time = #{createTime,jdbcType=TIMESTAMP} where pr_id = #{id,jdbcType=BIGINT}</update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.integral.CodePublishRecord">update yeshi_ec_code_publish_record
-    <set>
-      <if test="uid != null">pr_uid=#{uid,jdbcType=BIGINT},</if>
-      <if test="createTime != null">pr_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-    </set> where pr_id = #{id,jdbcType=BIGINT}
-  </update>
-  
-  <select id="listValid" resultMap="BaseResultVOMap">
-   SELECT p.*,u.`nick_name`,u.`portrait`,e.`uie_invite_code`  FROM yeshi_ec_code_publish_record p
-   LEFT JOIN `yeshi_ec_user` u ON u.`id` = p.`pr_uid`
-   LEFT JOIN `yeshi_ec_user_info_extra` e ON e.`uie_uid` = p.`pr_uid`
-   WHERE TIMESTAMPDIFF(SECOND,p.`pr_create_time`,NOW())<![CDATA[<]]> #{validTime}
-   ORDER BY p.`pr_create_time` DESC
-   LIMIT #{start},#{count}
-  </select>
-  
-  <select id="countValid" resultType="Long">
-   SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record
-   WHERE TIMESTAMPDIFF(SECOND,`pr_create_time`,NOW())<![CDATA[<]]> #{validTime}
-  </select>
-  
-  <select id="countValidRecord" resultType="Long">
-   SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record
-   WHERE  pr_uid = #{uid} AND TIMESTAMPDIFF(SECOND,`pr_create_time`,NOW())<![CDATA[<]]> #{validTime}
-  </select>
-  
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.integral.CodePublishRecord">
+		<id column="pr_id" property="id" jdbcType="BIGINT" />
+		<result column="pr_uid" property="uid" jdbcType="BIGINT" />
+		<result column="pr_create_time" property="createTime" jdbcType="TIMESTAMP" />
+	</resultMap>
+
+	<resultMap id="BaseResultVOMap"
+		type="com.yeshi.fanli.entity.integral.CodePublishRecord">
+		<id column="pr_id" property="id" jdbcType="BIGINT" />
+		<result column="pr_uid" property="uid" jdbcType="BIGINT" />
+		<result column="pr_create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="nick_name" property="nickName" jdbcType="VARCHAR" />
+		<result column="portrait" property="portrait" jdbcType="VARCHAR" />
+		<result column="uie_invite_code" property="inviteCode"
+			jdbcType="VARCHAR" />
+	</resultMap>
+
+	<sql id="Base_Column_List">pr_id,pr_uid,pr_create_time</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_code_publish_record where pr_id = #{id,jdbcType=BIGINT}
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_code_publish_record where pr_id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.integral.CodePublishRecord"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_code_publish_record (pr_id,pr_uid,pr_create_time) values
+		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.integral.CodePublishRecord"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_code_publish_record
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">pr_id,</if>
+			<if test="uid != null">pr_uid,</if>
+			<if test="createTime != null">pr_create_time,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="uid != null">#{uid,jdbcType=BIGINT},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.integral.CodePublishRecord">update
+		yeshi_ec_code_publish_record set pr_uid =
+		#{uid,jdbcType=BIGINT},pr_create_time =
+		#{createTime,jdbcType=TIMESTAMP} where pr_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.integral.CodePublishRecord">
+		update yeshi_ec_code_publish_record
+		<set>
+			<if test="uid != null">pr_uid=#{uid,jdbcType=BIGINT},</if>
+			<if test="createTime != null">pr_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+		</set>
+		where pr_id = #{id,jdbcType=BIGINT}
+	</update>
+
+	<select id="listValid" resultMap="BaseResultVOMap">
+		SELECT p.*,u.`nick_name`,u.`portrait`,e.`uie_invite_code` FROM
+		yeshi_ec_code_publish_record p
+		LEFT JOIN `yeshi_ec_user` u ON u.`id` = p.`pr_uid`
+		LEFT JOIN `yeshi_ec_user_info_extra` e ON e.`uie_uid` = p.`pr_uid`
+		WHERE TIMESTAMPDIFF(SECOND,p.`pr_create_time`,NOW())<![CDATA[<]]>
+		#{validTime}
+		ORDER BY p.`pr_create_time` DESC
+		LIMIT #{start},#{count}
+	</select>
+
+
+	<select id="listByMinTime" resultMap="BaseResultMap">
+		SELECT * FROM yeshi_ec_code_publish_record p where p.`pr_create_time` >=
+		#{minTime}
+		ORDER BY p.`pr_create_time` DESC
+		LIMIT #{start},#{count}
+	</select>
+
+	<select id="countValid" resultType="Long">
+		SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record
+		WHERE TIMESTAMPDIFF(SECOND,`pr_create_time`,NOW())<![CDATA[<]]>
+		#{validTime}
+	</select>
+
+	<select id="countValidRecord" resultType="Long">
+		SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record
+		WHERE pr_uid = #{uid} AND TIMESTAMPDIFF(SECOND,`pr_create_time`,NOW())<![CDATA[<]]>
+		#{validTime}
+	</select>
+
 </mapper>

--
Gitblit v1.8.0