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/msg/SystemZnxMapper.xml | 140 +++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/msg/SystemZnxMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/msg/SystemZnxMapper.xml
index 9d840c0..4281b7b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/msg/SystemZnxMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/msg/SystemZnxMapper.xml
@@ -1,70 +1,70 @@
-<?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.msg.SystemZnxMapper">
- <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.system.SystemZnx">
- <id column="id" property="id" jdbcType="BIGINT" />
- <result column="title" property="title" jdbcType="VARCHAR" />
- <result column="content" property="content" jdbcType="VARCHAR" />
- <result column="createTime" property="createTime" jdbcType="BIGINT" />
- </resultMap>
- <sql id="Base_Column_List">id,title,content,createTime</sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap"
- parameterType="java.lang.Long">
- select
- <include refid="Base_Column_List" />
- from yeshi_ec_system_msg where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
- yeshi_ec_system_msg where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.yeshi.fanli.entity.system.SystemZnx"
- useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_system_msg
- (id,title,content,createTime) values
- (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{createTime,jdbcType=BIGINT})
- </insert>
- <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.SystemZnx"
- useGeneratedKeys="true" keyProperty="id">
- insert into yeshi_ec_system_msg
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="title != null">title,</if>
- <if test="content != null">content,</if>
- <if test="createTime != null">createTime,</if>
- </trim>
- values
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="title != null">#{title,jdbcType=VARCHAR},</if>
- <if test="content != null">#{content,jdbcType=VARCHAR},</if>
- <if test="createTime != null">#{createTime,jdbcType=BIGINT},</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.SystemZnx">update
- yeshi_ec_system_msg set title = #{title,jdbcType=VARCHAR},content =
- #{content,jdbcType=VARCHAR},createTime = #{createTime,jdbcType=BIGINT}
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.SystemZnx">
- update yeshi_ec_system_msg
- <set>
- <if test="title != null">title=#{title,jdbcType=VARCHAR},</if>
- <if test="content != null">content=#{content,jdbcType=VARCHAR},</if>
- <if test="createTime != null">createTime=#{createTime,jdbcType=BIGINT},</if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
-
- <select id="listbyCreateTime" resultMap="BaseResultMap">
- SELECT * FROM yeshi_ec_system_msg t
- WHERE t.`createTime` <![CDATA[ >= ]]> #{createTime}
- </select>
-
- <select id="listbyUidAndCreateTime" resultMap="BaseResultMap">
- SELECT sm.* FROM `yeshi_ec_system_msg` sm
- LEFT JOIN (SELECT * FROM `yeshi_ec_account_message` a
- WHERE a.`uid`= #{uid} AND a.`system_msg_id` IS NOT NULL)s ON s.`system_msg_id`=sm.`id`
- WHERE s.`system_msg_id` IS NULL AND sm.createTime<![CDATA[ >= ]]> #{createTime}
- </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.msg.SystemZnxMapper">
+ <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.system.SystemZnx">
+ <id column="id" property="id" jdbcType="BIGINT" />
+ <result column="title" property="title" jdbcType="VARCHAR" />
+ <result column="content" property="content" jdbcType="VARCHAR" />
+ <result column="createTime" property="createTime" jdbcType="BIGINT" />
+ </resultMap>
+ <sql id="Base_Column_List">id,title,content,createTime</sql>
+ <select id="selectByPrimaryKey" resultMap="BaseResultMap"
+ parameterType="java.lang.Long">
+ select
+ <include refid="Base_Column_List" />
+ from yeshi_ec_system_msg where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+ yeshi_ec_system_msg where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.system.SystemZnx"
+ useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_system_msg
+ (id,title,content,createTime) values
+ (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{createTime,jdbcType=BIGINT})
+ </insert>
+ <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.SystemZnx"
+ useGeneratedKeys="true" keyProperty="id">
+ insert into yeshi_ec_system_msg
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="title != null">title,</if>
+ <if test="content != null">content,</if>
+ <if test="createTime != null">createTime,</if>
+ </trim>
+ values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="title != null">#{title,jdbcType=VARCHAR},</if>
+ <if test="content != null">#{content,jdbcType=VARCHAR},</if>
+ <if test="createTime != null">#{createTime,jdbcType=BIGINT},</if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.SystemZnx">update
+ yeshi_ec_system_msg set title = #{title,jdbcType=VARCHAR},content =
+ #{content,jdbcType=VARCHAR},createTime = #{createTime,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.SystemZnx">
+ update yeshi_ec_system_msg
+ <set>
+ <if test="title != null">title=#{title,jdbcType=VARCHAR},</if>
+ <if test="content != null">content=#{content,jdbcType=VARCHAR},</if>
+ <if test="createTime != null">createTime=#{createTime,jdbcType=BIGINT},</if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <select id="listbyCreateTime" resultMap="BaseResultMap">
+ SELECT * FROM yeshi_ec_system_msg t
+ WHERE t.`createTime` <![CDATA[ >= ]]> #{createTime}
+ </select>
+
+ <select id="listbyUidAndCreateTime" resultMap="BaseResultMap">
+ SELECT sm.* FROM `yeshi_ec_system_msg` sm
+ LEFT JOIN (SELECT * FROM `yeshi_ec_account_message` a
+ WHERE a.`uid`= #{uid} AND a.`system_msg_id` IS NOT NULL)s ON s.`system_msg_id`=sm.`id`
+ WHERE s.`system_msg_id` IS NULL AND sm.createTime<![CDATA[ >= ]]> #{createTime}
+ </select>
+
+</mapper>
--
Gitblit v1.8.0