From 5055a7ed4de24db06c0db9890ff7e4fba3dd5ccd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 14 十月 2026 13:54:38 +0800
Subject: [PATCH] fix: 修改查询逻辑以兼容 MySQL 8 的 ONLY_FULL_GROUP_BY 模式，使用 ANY_VALUE() 包裹非聚合列
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index a3f2f1d..c6190c5 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
@@ -14,11 +16,20 @@
@Data
public class SalesLedgerDto {
private Long id;
+ /**
+ * 瀵煎嚭鏃舵寜鍕鹃�夌殑鍙拌处ID杩囨护锛屼负绌哄垯鎸夋悳绱㈡潯浠跺鍑哄叏閮�
+ */
+ private List<Long> ids;
private String salesContractNo;
private String customerContractNo;
private String projectName;
-// @JsonFormat(pattern = "yyyy-MM-dd")
- private String entryDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date entryDate;
+
+ private String entryDateStart;
+ private String entryDateEnd;
+
+
private String salesman;
private Long customerId;
private String customerName;
@@ -38,15 +49,22 @@
private Boolean hasChildren = false;
private List<SalesLedgerProduct> productData;
+ private List<SalesLedgerProductDto> productDtoData;
private List<String> tempFileIds;
private List<CommonFile> SalesLedgerFiles;
- private Integer Type;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ private Integer type;
+ @Schema(description = "绛捐鏃ユ湡")
private LocalDate executionDate;
private Boolean status;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
+
+ @Schema(description = "浜よ揣鏃ユ湡")
+ private LocalDate deliveryDate;
+
+ private List<StorageBlobDTO> storageBlobDTOs;
+ private List<StorageBlobVO> StorageBlobVOs;
}
--
Gitblit v1.9.3