From 6b9a448e0f21cb6ffad5235f168f69b06e422fdf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 11 Sep 2024 07:29:01 +0800
Subject: [PATCH] md

---
 .../EmisSettleInvoiceChRecordMapper.xml       | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index bec0a5fbe..d658ebc05 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -30,6 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="salerBankAccNo"    column="saler_bank_acc_no"    />
         <result property="salerContact"    column="saler_contact"    />
         <result property="salerPhone"    column="saler_phone"    />
+        <result property="salerChecker"    column="saler_checker"    />
+        <result property="salerPayee"    column="saler_payee"    />
         <result property="invoiceNo"    column="invoice_no"    />
         <result property="filePath"    column="file_path"    />
         <result property="qrPath"    column="qr_path"    />
@@ -44,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisSettleInvoiceChRecordVo">
-        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_invoice_ch_record
+        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, saler_checker, saler_payee, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_invoice_ch_record
     </sql>
 
     <select id="selectEmisSettleInvoiceChRecordList" parameterType="EmisSettleInvoiceChRecord" resultMap="EmisSettleInvoiceChRecordResult">
@@ -204,27 +206,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
   
     <select id="selectEmisSettleInvoiceChRecordById" parameterType="Long" resultMap="EmisSettleInvoiceChRecordResult">
-        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, saler_checker, saler_payee, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_invoice_ch_record a
         where a.id = #{id}
     </select>
 
     <select id="selectEmisSettleInvoiceChRecordByReqNo" parameterType="String" resultMap="EmisSettleInvoiceChRecordResult">
-        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, saler_checker, saler_payee, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_invoice_ch_record a
         where a.req_no = #{ReqNo}
     </select>
 
     <select id="selectWaitQueryStatusList" parameterType="String" resultMap="EmisSettleInvoiceChRecordResult">
-        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, saler_checker, saler_payee, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_invoice_ch_record a
         where a.del_flag='0' and a.open_ch_status != '2'
     </select>
-        
+
     <insert id="insertEmisSettleInvoiceChRecord" parameterType="EmisSettleInvoiceChRecord" useGeneratedKeys="true" keyProperty="id">
         insert into emis_settle_invoice_ch_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="reqNo != null and reqNo != ''">req_no,</if>
             <if test="applySeqNo != null and applySeqNo != ''">apply_seq_no,</if>
             <if test="blEcinv != null and blEcinv != ''">bl_ecinv,</if>
@@ -249,6 +250,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="salerBankAccNo != null and salerBankAccNo != ''">saler_bank_acc_no,</if>
             <if test="salerContact != null and salerContact != ''">saler_contact,</if>
             <if test="salerPhone != null and salerPhone != ''">saler_phone,</if>
+            <if test="salerChecker != null and salerChecker != ''">saler_checker,</if>
+            <if test="salerPayee != null and salerPayee != ''">saler_payee,</if>
             <if test="invoiceNo != null and invoiceNo != ''">invoice_no,</if>
             <if test="filePath != null and filePath != ''">file_path,</if>
             <if test="qrPath != null and qrPath != ''">qr_path,</if>
@@ -268,9 +271,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="reqNo != null and reqNo != ''">#{reqNo},</if>
             <if test="applySeqNo != null and applySeqNo != ''">#{applySeqNo},</if>
             <if test="blEcinv != null and blEcinv != ''">#{blEcinv},</if>
@@ -295,6 +297,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="salerBankAccNo != null and salerBankAccNo != ''">#{salerBankAccNo},</if>
             <if test="salerContact != null and salerContact != ''">#{salerContact},</if>
             <if test="salerPhone != null and salerPhone != ''">#{salerPhone},</if>
+            <if test="salerChecker != null and salerChecker != ''">#{salerChecker},</if>
+            <if test="salerPayee != null and salerPayee != ''">#{salerPayee},</if>
             <if test="invoiceNo != null and invoiceNo != ''">#{invoiceNo},</if>
             <if test="filePath != null and filePath != ''">#{filePath},</if>
             <if test="qrPath != null and qrPath != ''">#{qrPath},</if>
@@ -314,7 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisSettleInvoiceChRecord" parameterType="EmisSettleInvoiceChRecord">
@@ -344,6 +348,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="salerBankAccNo != null and salerBankAccNo != ''">saler_bank_acc_no = #{salerBankAccNo},</if>
             <if test="salerContact != null and salerContact != ''">saler_contact = #{salerContact},</if>
             <if test="salerPhone != null and salerPhone != ''">saler_phone = #{salerPhone},</if>
+            <if test="salerChecker != null and salerChecker != ''">saler_checker = #{salerChecker},</if>
+            <if test="salerPayee != null and salerPayee != ''">saler_payee = #{salerPayee},</if>
             <if test="invoiceNo != null and invoiceNo != ''">invoice_no = #{invoiceNo},</if>
             <if test="filePath != null and filePath != ''">file_path = #{filePath},</if>
             <if test="qrPath != null and qrPath != ''">qr_path = #{qrPath},</if>
@@ -363,9 +369,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</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>