From b16eff90ae5bc7d239a96aa9a5a9a84bbcce4341 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 3 Jul 2024 22:38:10 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisWaybillAjustApplyMapper.xml   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
index 8bf6dda05..90b8e4a03 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
@@ -21,6 +21,7 @@
         <result property="oldValue"    column="old_value"    />
         <result property="newValue"    column="new_value"    />
         <result property="blValueJson"    column="bl_value_json"    />
+        <result property="jsonData"    column="json_data"    />
         <result property="applyMemo"    column="apply_memo"    />
         <result property="blCenterConfirmed"    column="bl_center_confirmed"    />
         <result property="centerConfirmSiteCode"    column="center_confirm_site_code"    />
@@ -211,7 +212,7 @@
 	</select>
 
     <select id="selectEmisWaybillAjustApplyById" parameterType="Long" resultMap="EmisWaybillAjustApplyResult">
-        select id, bill_code, apply_type, apply_man_code, apply_site_code, apply_finance_center_code, apply_date, bl_dest_confirmed, dest_confirm_site_code, dest_confirm_date, dest_confirm_note, dest_confirm_man_code, dest_finance_center_code, old_value, new_value, bl_value_json, apply_memo, bl_center_confirmed, center_confirm_site_code, center_confirm_man_code, center_confirm_date, center_confirm_note, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, bill_code, apply_type, apply_man_code, apply_site_code, apply_finance_center_code, apply_date, bl_dest_confirmed, dest_confirm_site_code, dest_confirm_date, dest_confirm_note, dest_confirm_man_code, dest_finance_center_code, old_value, new_value, bl_value_json, json_data, apply_memo, bl_center_confirmed, center_confirm_site_code, center_confirm_man_code, center_confirm_date, center_confirm_note, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_waybill_ajust_apply a
         where a.id = #{id}
     </select>
@@ -265,6 +266,7 @@
             <if test="oldValue != null and oldValue != ''">old_value,</if>
             <if test="newValue != null and newValue != ''">new_value,</if>
             <if test="blValueJson != null and blValueJson != ''">bl_value_json,</if>
+            <if test="jsonData != null and jsonData != ''">json_data,</if>
             <if test="applyMemo != null and applyMemo != ''">apply_memo,</if>
             <if test="blCenterConfirmed != null and blCenterConfirmed != ''">bl_center_confirmed,</if>
             <if test="centerConfirmSiteCode != null and centerConfirmSiteCode != ''">center_confirm_site_code,</if>
@@ -298,6 +300,7 @@
             <if test="oldValue != null and oldValue != ''">#{oldValue},</if>
             <if test="newValue != null and newValue != ''">#{newValue},</if>
             <if test="blValueJson != null and blValueJson != ''">#{blValueJson},</if>
+            <if test="jsonData != null and jsonData != ''">#{jsonData},</if>
             <if test="applyMemo != null and applyMemo != ''">#{applyMemo},</if>
             <if test="blCenterConfirmed != null and blCenterConfirmed != ''">#{blCenterConfirmed},</if>
             <if test="centerConfirmSiteCode != null and centerConfirmSiteCode != ''">#{centerConfirmSiteCode},</if>
@@ -334,6 +337,7 @@
             <if test="oldValue != null and oldValue != ''">old_value = #{oldValue},</if>
             <if test="newValue != null and newValue != ''">new_value = #{newValue},</if>
             <if test="blValueJson != null and blValueJson != ''">bl_value_json = #{blValueJson},</if>
+            <if test="jsonData != null and jsonData != ''">json_data = #{jsonData},</if>
             <if test="applyMemo != null and applyMemo != ''">apply_memo = #{applyMemo},</if>
             <if test="blCenterConfirmed != null and blCenterConfirmed != ''">bl_center_confirmed = #{blCenterConfirmed},</if>
             <if test="centerConfirmSiteCode != null and centerConfirmSiteCode != ''">center_confirm_site_code = #{centerConfirmSiteCode},</if>
@@ -354,11 +358,11 @@
     </update>
 
     <delete id="deleteEmisWaybillAjustApplyById" parameterType="Long">
-        delete from emis_waybill_ajust_apply where id = #{id}
+        update emis_waybill_ajust_apply set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisWaybillAjustApplyByIds" parameterType="String">
-        delete from emis_waybill_ajust_apply where id in
+        update emis_waybill_ajust_apply set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>