From 11764db5bd07db8f2f96a22a5f7f7f3ecc34e17d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 23:38:08 +0800
Subject: [PATCH] md

---
 .../emis/domain/EmisWaybillAttachment.java    |  4 +--
 .../mapper/EmisWaybillAttachmentMapper.xml    | 28 +++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
index eabbdd330..ad0232614 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisWaybillAttachment.java
  * @author linfso
- * @date 2024-05-23 13:33:16
+ * @date 2024-05-23 15:35:53
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 运单附件 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisWaybillAttachment
  * @Description 运单附件
  * @author linfso
- * @date 2024-05-23 13:33:16
+ * @date 2024-05-23 15:35:53
  */
 @Data
 public class EmisWaybillAttachment extends BaseEntity
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index 7f3101936..e956b45ce 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -14,16 +14,18 @@
         <result property="fileSiez"    column="file_siez"    />
         <result property="fileDesc"    column="file_desc"    />
         <result property="orderNum"    column="order_num"    />
+        <result property="remark"    column="remark"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="createSite"    column="create_site"    />
+        <result property="updateSite"    column="update_site"    />
     </resultMap>
 
     <sql id="selectEmisWaybillAttachmentVo">
-        select id, waybill_id, bill_code, attach_type, file_name, file_url, file_siez, file_desc, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_attachment
+        select id, waybill_id, bill_code, attach_type, file_name, file_url, file_siez, file_desc, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_waybill_attachment
     </sql>
 
     <select id="selectEmisWaybillAttachmentList" parameterType="EmisWaybillAttachment" resultMap="EmisWaybillAttachmentResult">
@@ -39,12 +41,14 @@
             <if test="fileSiez != null "> and file_siez = #{fileSiez}</if>
             <if test="fileDesc != null  and fileDesc != ''"> and file_desc like concat('%', #{fileDesc}, '%')</if>
             <if test="orderNum != null "> and order_num like concat('%', #{orderNum}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
         </where>
         order by create_time desc
     </select>
@@ -61,17 +65,19 @@
            and file_siez = #{fileSiez}
            and file_desc = #{fileDesc}
            and order_num = #{orderNum}
+           and remark = #{remark}
            and del_flag = #{delFlag}
            and create_by = #{createBy}
            and create_time = #{createTime}
            and update_by = #{updateBy}
            and update_time = #{updateTime}
-           and remark = #{remark}
+           and create_site = #{createSite}
+           and update_site = #{updateSite}
 		limit 1
 	</select>
 
     <select id="selectEmisWaybillAttachmentById" parameterType="Long" resultMap="EmisWaybillAttachmentResult">
-        select id, waybill_id, bill_code, attach_type, file_name, file_url, file_siez, file_desc, order_num, del_flag, create_by, create_time, update_by, update_time, remark
+        select id, waybill_id, bill_code, attach_type, file_name, file_url, file_siez, file_desc, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_waybill_attachment a
         where a.id = #{id}
     </select>
@@ -88,12 +94,14 @@
             <if test="fileSiez != null">file_siez,</if>
             <if test="fileDesc != null and fileDesc != ''">file_desc,</if>
             <if test="orderNum != null">order_num,</if>
+            <if test="remark != null and remark != ''">remark,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="remark != null and remark != ''">remark,</if>
+            <if test="createSite != null and createSite != ''">create_site,</if>
+            <if test="updateSite != null and updateSite != ''">update_site,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -105,12 +113,14 @@
             <if test="fileSiez != null">#{fileSiez},</if>
             <if test="fileDesc != null and fileDesc != ''">#{fileDesc},</if>
             <if test="orderNum != null">#{orderNum},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
         </trim>
     </insert>
 
@@ -125,12 +135,14 @@
             <if test="fileSiez != null">file_siez = #{fileSiez},</if>
             <if test="fileDesc != null and fileDesc != ''">file_desc = #{fileDesc},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
         </trim>
         where id = #{id}
     </update>