From 3d6ca92772712a037f1ebc9648a4b1feaf8d198f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 27 四月 2024 18:56:52 +0800
Subject: [PATCH] 1、修改DownloadFileCtrl中的文件名称转码方式； 2、用EasyExcel实现标识类二维码导出excel文件并下载功能。
---
pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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 f02960f..5c0e8fb 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -6,13 +6,16 @@
<!--@Table ba_log-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
+ <result column="user_name" jdbcType="VARCHAR" property="userName" />
<result column="content" jdbcType="VARCHAR" property="content" />
<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, dt,ip
+ id, user_id,user_name, content, dt,ip,code,msg
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -23,10 +26,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, dt,ip
+ insert into ba_log (user_id,user_name, content, ip,code,msg
)
- values (#{userId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}
- , #{ip,jdbcType=VARCHAR}
+ values (#{userId,jdbcType=BIGINT},#{userName,jdbcType=VARCHAR}, #{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">
@@ -36,11 +39,17 @@
<if test="userId != null">
user_id,
</if>
+ <if test="userName != null">
+ user_name,
+ </if>
<if test="content != null">
content,
</if>
- <if test="dt != null">
- dt,
+ <if test="code != null">
+ code,
+ </if>
+ <if test="msg != null">
+ msg,
</if>
<if test="ip != null">
ip,
@@ -50,11 +59,17 @@
<if test="userId != null">
#{userId,jdbcType=BIGINT},
</if>
+ <if test="userName != null">
+ #{userName,jdbcType=VARCHAR},
+ </if>
<if test="content != null">
#{content,jdbcType=VARCHAR},
</if>
- <if test="dt != null">
- #{dt,jdbcType=TIMESTAMP},
+ <if test="code != null">
+ #{code,jdbcType=VARCHAR},
+ </if>
+ <if test="msg != null">
+ #{msg,jdbcType=VARCHAR},
</if>
<if test="ip != null">
#{ip,jdbcType=VARCHAR},
@@ -71,6 +86,9 @@
<trim prefix="where " suffixOverrides="and">
<if test="userId != null and userId != ''">
user_id = #{userId,jdbcType=BIGINT} and
+ </if>
+ <if test="userName != null and userName != ''">
+ user_name = #{userName,jdbcType=VARCHAR} and
</if>
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
@@ -97,6 +115,9 @@
<if test="userId != null and userId != ''">
user_id = #{userId,jdbcType=BIGINT} and
</if>
+ <if test="userName != null and userName != ''">
+ user_name = #{userName,jdbcType=VARCHAR} and
+ </if>
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
</if>
--
Gitblit v1.8.0