From a905c3a3daf7aa8d97d611d53f3828b0bd372299 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sat, 11 Apr 2026 13:40:07 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E4=B8=BB=E4=BD=93=E5=A2=9E=E5=8A=A0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java  |  2 ++
 .../resources/mapper/EmisBaseInvoiceInfoMapper.xml   | 12 +++++++++---
 .../main/resources/mapper/EmisSettleBillMapper.xml   |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java
index 44c94477b..35b829ec5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java
@@ -62,5 +62,7 @@ public class EmisBaseInvoiceInfo extends BaseEntity
     private String recieveAddress;
     /* 发票投递邮箱 */
     private String email;
+    /* 公司开票信息排序 */
+    private Long invoiceInfoSort;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
index 4fd13fab3..03a55fde5 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
@@ -18,10 +18,11 @@
         <result property="phone"    column="phone"    />
         <result property="recieveAddress"    column="recieve_address"    />
         <result property="email"    column="email"    />
+        <result property="invoiceInfoSort"    column="invoice_info_sort"    />
     </resultMap>
 
     <sql id="selectEmisBaseInvoiceInfoVo">
-        select id, com_code, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_base_invoice_info
+        select id, com_code, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, contact, phone, recieve_address, email, invoice_info_sort, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_base_invoice_info
     </sql>
 
     <select id="selectEmisBaseInvoiceInfoList" parameterType="EmisBaseInvoiceInfo" resultMap="EmisBaseInvoiceInfoResult">
@@ -41,6 +42,7 @@
             <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
             <if test="recieveAddress != null  and recieveAddress != ''"> and recieve_address like concat('%', #{recieveAddress}, '%')</if>
             <if test="email != null  and email != ''"> and email like concat('%', #{email}, '%')</if>
+            <if test="invoiceInfoSort != null"> and invoice_info_sort = #{invoiceInfoSort}</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>
@@ -50,7 +52,7 @@
             <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
+        order by invoice_info_sort asc,create_time desc
     </select>
 
     <select id="checkUnique" parameterType="EmisBaseInvoiceInfo"  resultType="int">
@@ -69,6 +71,7 @@
            and phone = #{phone}
            and recieve_address = #{recieveAddress}
            and email = #{email}
+           and invoice_info_sort = #{invoiceInfoSort}
            and remark = #{remark}
            and del_flag = #{delFlag}
            and create_by = #{createBy}
@@ -81,7 +84,7 @@
 	</select>
 
     <select id="selectEmisBaseInvoiceInfoById" parameterType="Long" resultMap="EmisBaseInvoiceInfoResult">
-        select id, com_code, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, com_code, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, contact, phone, recieve_address, email, invoice_info_sort, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_base_invoice_info a
         where a.id = #{id}
     </select>
@@ -102,6 +105,7 @@
             <if test="phone != null and phone != ''">phone,</if>
             <if test="recieveAddress != null and recieveAddress != ''">recieve_address,</if>
             <if test="email != null and email != ''">email,</if>
+            <if test="invoiceInfoSort != null">invoice_info_sort,</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>
@@ -125,6 +129,7 @@
             <if test="phone != null and phone != ''">#{phone},</if>
             <if test="recieveAddress != null and recieveAddress != ''">#{recieveAddress},</if>
             <if test="email != null and email != ''">#{email},</if>
+            <if test="invoiceInfoSort != null">#{invoiceInfoSort},</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>
@@ -151,6 +156,7 @@
             <if test="phone != null and phone != ''">phone = #{phone},</if>
             <if test="recieveAddress != null and recieveAddress != ''">recieve_address = #{recieveAddress},</if>
             <if test="email != null and email != ''">email = #{email},</if>
+            <if test="invoiceInfoSort != null">invoice_info_sort = #{invoiceInfoSort},</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>
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index aea91a9a1..dba8adfa1 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -1362,7 +1362,7 @@
             <if test="deductionReason != null  and deductionReason != ''"> and deduction_reason = #{deductionReason}</if>
             <if test="otherReason != null  and otherReason != ''"> and other_reason = #{otherReason}</if>
             <if test="openBillStatus != null  and openBillStatus != ''"> and open_bill_status = #{openBillStatus}</if>
-            <if test="paymentStatus != null  and paymentStatus != ''"> and payment_status = #{paymentStatus}</if>
+            <if test="paymentStatus != null  and paymentStatus != ''"> and FIND_IN_SET( payment_status, {paymentStatus} )</if>
             <if test="chargeStatus != null  and chargeStatus != ''"> and charge_status = #{chargeStatus}</if>
             <if test="sendPieceSum != null "> and send_piece_sum = #{sendPieceSum}</if>
             <if test="pieceNumber != null "> and piece_number = #{pieceNumber}</if>