From 5b207a55bdd10f1516031f629217daac069b64fd Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 30 八月 2024 11:40:31 +0800
Subject: [PATCH] 添加免登录查询所有排班接口;

---
 pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml |   57 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 19 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..1c2b4b8 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,13 +39,19 @@
       <if test="userId != null">
         user_id,
       </if>
-      <if test="content != null">
+      <if test="userName != null and userName !=''">
+        user_name,
+      </if>
+      <if test="content != null and content !=''">
         content,
       </if>
-      <if test="dt != null">
-        dt,
+      <if test="code != null and code !=''">
+        code,
       </if>
-      <if test="ip != null">
+      <if test="msg != null and msg !=''">
+        msg,
+      </if>
+      <if test="ip != null and ip !=''">
         ip,
       </if>
     </trim>
@@ -50,13 +59,19 @@
       <if test="userId != null">
         #{userId,jdbcType=BIGINT},
       </if>
-      <if test="content != null">
+      <if test="userName != null and userName !=''">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null and content !=''">
         #{content,jdbcType=VARCHAR},
       </if>
-      <if test="dt != null">
-        #{dt,jdbcType=TIMESTAMP},
+      <if test="code != null and code !=''">
+        #{code,jdbcType=VARCHAR},
       </if>
-      <if test="ip != null">
+      <if test="msg != null and msg !=''">
+        #{msg,jdbcType=VARCHAR},
+      </if>
+      <if test="ip != null and ip !=''">
         #{ip,jdbcType=VARCHAR},
       </if>
     </trim>
@@ -64,19 +79,20 @@
 
   <select id="selectSome" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" >
-      <property name="alias" value="r"/>
-    </include>
+    <include refid="Base_Column_List" />
     from ba_log r
     <trim prefix="where " suffixOverrides="and">
-      <if test="userId != null and userId != ''">
+      <if test="userId != null">
         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>
       <if test="dt != null and dt != '' ">
-        dt = #{dt,jdbcType=TIMESTAMP} and
+        DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
       </if>
       <if test="ip != null and ip != '' ">
         ip =#{ip,jdbcType=VARCHAR} and
@@ -94,14 +110,17 @@
     select count(1)
     from ba_log r
     <trim prefix="where " suffixOverrides="and">
-      <if test="userId != null and userId != ''">
+      <if test="userId != null">
         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>
       <if test="dt != null and dt != '' ">
-        dt = #{dt,jdbcType=TIMESTAMP} and
+        DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
       </if>
       <if test="ip != null and ip != '' ">
         ip =#{ip,jdbcType=VARCHAR} and

--
Gitblit v1.8.0