aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: 公司开票主体增加排序

Browse Source
This commit is contained in:
aike 2026-04-11 13:40:07 +08:00
parent 39fb3d8a06
commit a905c3a3da
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceInfo.java
View File

@ -62,5 +62,7 @@ public class EmisBaseInvoiceInfo extends BaseEntity
private String recieveAddress;
/* 发票投递邮箱 */
private String email;
/* 公司开票信息排序 */
private Long invoiceInfoSort;
}

12
emis-biz/src/main/resources/mapper/EmisBaseInvoiceInfoMapper.xml
View File

@ -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>

2
emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
View File

@ -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>