From 01e45371334efcf7f4ccf2fbf8343ec063aa1ff2 Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期六, 19 四月 2025 11:14:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobLogMapper.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobLogMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobLogMapper.xml
index 080e5f3..5424f24 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobLogMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobLogMapper.xml
@@ -17,7 +17,9 @@
     </resultMap>
 
     <sql id="selectApsWorkOrderJobLogVo">
-        select id, page_num, page_count, response_data, result, order_id, request_data,create_time,  update_time  from aps_work_order_job_log
+        select id, page_num, page_count, response_data, result, order_id, request_data,create_time,
+               update_time  ,biz_type
+        from aps_work_order_job_log
     </sql>
 
     <select id="selectApsWorkOrderJobLogList" parameterType="ApsWorkOrderJobLog" resultMap="ApsWorkOrderJobLogResult">
@@ -29,6 +31,7 @@
             <if test="result != null  and result != ''"> and result = #{result}</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
             <if test="requestData != null  and requestData != ''"> and request_data = #{requestData}</if>
+            <if test="bizType != null  and bizType != ''"> and biz_type = #{bizType}</if>
         </where>
     </select>
     
@@ -48,6 +51,7 @@
             <if test="requestData != null">request_data,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="bizType != null">biz_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pageNum != null">#{pageNum},</if>
@@ -56,8 +60,9 @@
             <if test="result != null">#{result},</if>
             <if test="orderId != null">#{orderId},</if>
             <if test="requestData != null">#{requestData},</if>
-            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="bizType != null">#{bizType},</if>
          </trim>
     </insert>
 
@@ -72,6 +77,7 @@
             <if test="requestData != null">request_data = #{requestData},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="bizType != null">biz_type = #{bizType},</if>
         </trim>
         where id = #{id}
     </update>
@@ -86,4 +92,5 @@
             #{id}
         </foreach>
     </delete>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3