From d3b5fe3ea8c054055c9cc5ef450a180584968aea Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 08 五月 2025 17:33:13 +0800
Subject: [PATCH] 开票登记功能开发

---
 src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml           |    4 ++--
 src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
index eaf278b..8057419 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -13,6 +13,7 @@
 import com.ruoyi.sales.service.InvoiceRegistrationService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,8 +23,10 @@
 @Service
 public class InvoiceRegistrationServiceImpl extends ServiceImpl<InvoiceRegistrationMapper, InvoiceRegistration> implements InvoiceRegistrationService {
 
+    @Autowired
     private InvoiceRegistrationMapper invoiceRegistrationMapper;
 
+    @Autowired
     private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
 
 
@@ -96,7 +99,7 @@
      */
     @Override
     public IPage<InvoiceRegistrationDto> invoiceRegistrationListPage(Page page, InvoiceRegistrationDto invoiceRegistrationDto) {
-        return null;
+        return invoiceRegistrationMapper.invoiceRegistrationListPage(page, invoiceRegistrationDto);
     }
 
     /**
@@ -106,6 +109,6 @@
      */
     @Override
     public List<InvoiceRegistrationProductDto> invoiceRegistrationProductList(InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
-        return Collections.emptyList();
+        return invoiceRegistrationProductMapper.invoiceRegistrationProductList(invoiceRegistrationProductDto);
     }
 }
diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
index 5a6b7c1..5c6f164 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper">
 
-    <select id="invoiceRegistrationProductList" resultType="com.ruoyi.sales.dto.InvoiceRegistrationDto">
+    <select id="invoiceRegistrationProductList" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
         SELECT
             id   ,
             sales_ledger_id           ,
@@ -27,7 +27,7 @@
             create_user               ,
             update_time               ,
             update_user               ,
-            tenant_id                 ,
+            tenant_id
         FROM invoice_registration_product
         <where>
             <if test="invoiceRegistrationProductDto.invoiceRegistrationId != null">

--
Gitblit v1.9.3