From 9a0d28e97105adc7979b2450b48ee2e912301493 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 24 四月 2024 16:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
index c7cd531..7a2bcf7 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -7,12 +7,14 @@
<id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="content" jdbcType="VARCHAR" property="content" />
- <result column="res_ip" jdbcType="VARCHAR" property="resIp" />
- <result column="create_dt" jdbcType="TIMESTAMP" property="createDt" />
+ <result column="ip" jdbcType="VARCHAR" property="ip" />
+ <result column="code" jdbcType="VARCHAR" property="code" />
+ <result column="msg" jdbcType="VARCHAR" property="msg" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, user_id, content, create_dt,res_ip
+ id, user_id, content, dt,ip,code,msg
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -23,10 +25,10 @@
</select>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
<!--@mbg.generated-->
- insert into ba_log (user_id, content, create_dt,res_ip
+ insert into ba_log (user_id, content, ip,code,msg
)
- values (#{userId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{createDt,jdbcType=TIMESTAMP}
- , #{resIp,jdbcType=VARCHAR}
+ values (#{userId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
+ #{code,jdbcType=VARCHAR},#{msg,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
@@ -39,11 +41,14 @@
<if test="content != null">
content,
</if>
- <if test="createDt != null">
- create_dt,
+ <if test="code != null">
+ code,
</if>
- <if test="resIp != null">
- res_ip,
+ <if test="msg != null">
+ msg,
+ </if>
+ <if test="ip != null">
+ ip,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -53,11 +58,14 @@
<if test="content != null">
#{content,jdbcType=VARCHAR},
</if>
- <if test="createDt != null">
- #{createDt,jdbcType=TIMESTAMP},
+ <if test="code != null">
+ #{code,jdbcType=VARCHAR},
</if>
- <if test="resIp != null">
- #{resIp,jdbcType=VARCHAR},
+ <if test="msg != null">
+ #{msg,jdbcType=VARCHAR},
+ </if>
+ <if test="ip != null">
+ #{ip,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@@ -75,11 +83,11 @@
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
</if>
- <if test="createDt != null and createDt != '' ">
- create_dt = #{createDt,jdbcType=TIMESTAMP} and
+ <if test="dt != null and dt != '' ">
+ dt = #{dt,jdbcType=TIMESTAMP} and
</if>
- <if test="resIp != null and resIp != '' ">
- res_ip =#{resIp,jdbcType=VARCHAR} and
+ <if test="ip != null and ip != '' ">
+ ip =#{ip,jdbcType=VARCHAR} and
</if>
</trim>
order by id desc
@@ -100,11 +108,11 @@
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
</if>
- <if test="createDt != null and createDt != '' ">
- create_dt = #{createDt,jdbcType=TIMESTAMP} and
+ <if test="dt != null and dt != '' ">
+ dt = #{dt,jdbcType=TIMESTAMP} and
</if>
- <if test="resIp != null and resIp != '' ">
- res_ip =#{resIp,jdbcType=VARCHAR} and
+ <if test="ip != null and ip != '' ">
+ ip =#{ip,jdbcType=VARCHAR} and
</if>
</trim>
</select>
--
Gitblit v1.8.0