From 05b430789fa8b375acc6e4d4abd98f89c430e3a7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 九月 2025 10:05:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java                 |    2 +-
 src/main/resources/mapper/sales/ReceiptPaymentMapper.xml                       |   22 ++++++++++++++--------
 src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java |    5 +++--
 src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java                       |    5 +++++
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
index a14b2c6..2394982 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
@@ -6,6 +6,7 @@
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.device.dto.DeviceDefectRecordDto;
 import com.ruoyi.device.mapper.DeviceDefectRecordMapper;
+import com.ruoyi.device.mapper.DeviceRepairMapper;
 import com.ruoyi.device.pojo.DeviceDefectRecord;
 import com.ruoyi.device.pojo.DeviceRepair;
 import com.ruoyi.device.service.DeviceDefectRecordService;
@@ -24,7 +25,7 @@
     private DeviceDefectRecordMapper deviceDefectRecordMapper;
 
     @Autowired
-    private IDeviceRepairService deviceRepairService;
+    private DeviceRepairMapper deviceRepairMapper;
 
     @Override
     public IPage<DeviceDefectRecordDto> listPage(Page page, DeviceDefectRecordDto deviceDefectRecordDto) {
@@ -40,7 +41,7 @@
             //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
             deviceRepair.setRepairName(SecurityUtils.getUsername());
             deviceRepair.setRepairTime(new Date());
-            deviceRepairService.saveDeviceRepair(deviceRepair);
+            deviceRepairMapper.insert(deviceRepair);
             return deviceDefectRecordMapper.insert(deviceDefectRecord) > 0;
         } else if (status.equals("涓�鑸己闄�")) {
             return deviceDefectRecordMapper.insert(deviceDefectRecord) > 0;
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 927442b..c49a3b2 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -29,6 +29,11 @@
     @ApiModelProperty(value = "寮�绁ㄦ棩鏈�")
     private Date invoiceDate;
 
+    @TableField(exist = false)
+    private String invoiceDateStart;
+    @TableField(exist = false)
+    private String invoiceDateEnd;
+
     @ApiModelProperty(value = "鏌ヨ鏂囨湰")
     private String searchText;
 
diff --git a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
index e7b34ed..222f9f5 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
@@ -26,7 +26,7 @@
      * @param receiptPaymentDto
      * @return
      */
-    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("c") ReceiptPaymentDto receiptPaymentDto);
+    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("req") ReceiptPaymentDto receiptPaymentDto);
 
     /**
      * 寮�绁ㄥ彴璐﹁鎯�
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index b70a04b..a52038b 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -95,17 +95,23 @@
         BY invoice_ledger_id
         ) T6 ON T1.id = T6.invoice_ledger_id
         <where>
-            <if test="c.customerName != null and c.customerName !=''">
-                AND T3.customer_name LIKE CONCAT('%',#{c.customerName},'%')
+            <if test="req.customerName != null and req.customerName !=''">
+                AND T3.customer_name LIKE CONCAT('%',#{req.customerName},'%')
             </if>
-            <if test="c.invoiceLedgerId != null">
-                AND T1.id = #{c.invoiceLedgerId}
+            <if test="req.invoiceLedgerId != null">
+                AND T1.id = #{req.invoiceLedgerId}
             </if>
-            <if test="c.customerContractNo != null and c.customerContractNo !=''">
-                AND T3.customer_contract_no LIKE CONCAT('%',#{c.customerContractNo},'%')
+            <if test="req.customerContractNo != null and req.customerContractNo !=''">
+                AND T3.customer_contract_no LIKE CONCAT('%',#{req.customerContractNo},'%')
             </if>
-            <if test="c.projectName != null and c.projectName !=''">
-                AND T3.project_name LIKE CONCAT('%',#{c.projectName},'%')
+            <if test="req.projectName != null and req.projectName !=''">
+                AND T3.project_name LIKE CONCAT('%',#{req.projectName},'%')
+            </if>
+            <if test="req.invoiceDateStart != null and req.invoiceDateStart != '' ">
+                AND T1.invoice_date &gt;= DATE_FORMAT(#{req.invoiceDateStart},'%Y-%m-%d')
+            </if>
+            <if test="req.invoiceDateEnd != null and req.invoiceDateEnd != '' ">
+                AND  T1.invoice_date &lt;= DATE_FORMAT(#{req.invoiceDateEnd},'%Y-%m-%d')
             </if>
         </where>
         ORDER BY T2.create_time DESC

--
Gitblit v1.9.3