From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro

---
 src/main/resources/mapper/account/sales/AccountSalesInvoiceMapper.xml |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/account/sales/AccountSalesInvoiceMapper.xml b/src/main/resources/mapper/account/sales/AccountSalesInvoiceMapper.xml
new file mode 100644
index 0000000..e69d79d
--- /dev/null
+++ b/src/main/resources/mapper/account/sales/AccountSalesInvoiceMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.sales.AccountSalesInvoiceMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.sales.AccountSalesInvoice">
+        <id column="id" property="id" />
+        <result column="account_invoice_application_id" property="accountInvoiceApplicationId" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_user" property="updateUser" />
+        <result column="update_time" property="updateTime" />
+        <result column="dept_id" property="deptId" />
+        <result column="invoice_number" property="invoiceNumber" />
+        <result column="tax_rate" property="taxRate" />
+        <result column="invoice_type" property="invoiceType" />
+        <result column="issue_date" property="issueDate" />
+        <result column="tax_exclusivel_price" property="taxExclusivelPrice" />
+        <result column="tax_price" property="taxPrice" />
+        <result column="tax_inclusive_price" property="taxInclusivePrice" />
+        <result column="remark" property="remark" />
+        <result column="invoice_content" property="invoiceContent" />
+        <result column="customer_id" property="customerId" />
+        <result column="storage_attachment_id" property="storageAttachmentId" />
+    </resultMap>
+    <select id="listPageAccountSalesInvoice"
+            resultType="com.ruoyi.account.bean.vo.sales.AccountSalesInvoiceVo">
+        select asi.* , c.customer_name
+        from account_sales_invoice asi
+        left join customer c on asi.customer_id = c.id
+         <where>
+            <if test="req.customerId != null">
+                 AND asi.customer_id = #{req.customerId}
+            </if>
+            <if test="req.status != null">
+                AND asi.status = #{req.status}
+            </if>
+            <if test="req.invoiceNumber != null and req.invoiceNumber != ''">
+                AND asi.invoice_number LIKE CONCAT('%',#{req.invoiceNumber},'%')
+            </if>
+            <if test="req.startDate != null and req.endDate != null">
+                AND asi.issue_date BETWEEN #{req.startDate} AND #{req.endDate}
+            </if>
+        </where>
+        order by asi.id desc
+    </select>
+
+</mapper>

--
Gitblit v1.9.3