From a508511946c4b2c8aed6cf6eedf0df7659807a06 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 30 六月 2025 10:37:10 +0800
Subject: [PATCH] 2025-06-30 bug修改
---
src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml | 9 ++++++++-
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 4 ++--
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 3 +++
src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java | 10 ++++++++++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 1 +
src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 2 ++
6 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index abf43f9..fc19d5d 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -13,6 +13,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.List;
@RestController
@@ -160,6 +161,7 @@
*/
@GetMapping("/registrationProductPage")
public AjaxResult registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
+
return AjaxResult.success(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
}
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
index 8df3e22..23fe6b4 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
@@ -12,6 +12,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
@Data
@@ -60,4 +61,13 @@
private Boolean status;
+ private String projectName;
+
+
+ @TableField(exist = false)
+ private String createTimeStart;
+ @TableField(exist = false)
+ private String createTimeEnd;
+
+
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 82d8b97..a3f2f1d 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -17,8 +17,8 @@
private String salesContractNo;
private String customerContractNo;
private String projectName;
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date entryDate;
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ private String entryDate;
private String salesman;
private Long customerId;
private String customerName;
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index a31835b..017cda9 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -103,6 +103,7 @@
// 2. 鏌ヨ瀛愯〃
LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());
+ productWrapper.eq(SalesLedgerProduct::getType, 1);
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
for (SalesLedgerProduct product : products) {
product.setOriginalNoInvoiceNum(product.getNoInvoiceNum());
diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
index 823ecac..e03ea6b 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
@@ -91,7 +91,8 @@
IFNULL(T3.invoice_total,0) AS invoice_total,
T3.invoice_person,
T3.invoice_date,
- T4.invoiceFileName
+ T4.invoiceFileName,
+ T2.project_name
FROM invoice_registration_product T1
LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
LEFT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
@@ -114,6 +115,12 @@
<if test="invoiceRegistrationProductDto.invoiceDateEnd != null and invoiceRegistrationProductDto.invoiceDateEnd != ''">
AND T3.invoice_date <= date_format(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d')
</if>
+ <if test="invoiceRegistrationProductDto.createTimeStart != null ">
+ AND T1.create_time >= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')
+ </if>
+ <if test="invoiceRegistrationProductDto.createTimeEnd != null ">
+ AND T1.create_time <= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')+interval 1 day
+ </if>
</where>
ORDER BY T1.create_time DESC
</select>
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 139b1fb..dd7c80f 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -75,6 +75,9 @@
<if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
</if>
+ <if test="salesLedgerDto.entryDate != null and salesLedgerDto.entryDate != '' ">
+ T1.entry_date = DATE_FORMAT(#{salesLedgerDto.entryDate},'%Y-%m-%d')
+ </if>
</where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3