From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 204f688..8a4c044 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -2,11 +2,15 @@
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.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -17,7 +21,7 @@
private String salesContractNo;
private String customerContractNo;
private String projectName;
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date entryDate;
private String entryDateStart;
@@ -58,4 +62,42 @@
@Schema(description = "浜よ揣鏃ユ湡")
private LocalDate deliveryDate;
+
+ private List<StorageBlobDTO> storageBlobDTOs;
+ private List<StorageBlobVO> StorageBlobVOs;
+
+ @Schema(description = "椤圭洰ID")
+ private Long projectId;
+
+ @Schema(description = "骞翠唤")
+ private Integer year;
+
+ @Schema(description = "绛惧崟鍗曚綅ID")
+ private Long signingUnitId;
+
+ @Schema(description = "鍔炰簨澶処D")
+ private Long officeId;
+
+ @Schema(description = "缁勮礋璐ｄ汉ID")
+ private Long groupLeaderId;
+
+ @Schema(description = "鏄惁寮�鍙戠エ(1鏄� 0鍚�)")
+ private Integer isInvoice;
+
+ @Schema(description = "涓爣浠�")
+ private BigDecimal bidPrice;
+
+ @Schema(description = "鏄惁涓爣(1鏄� 0鍚�)")
+ private Integer isBid;
+
+ @Schema(description = "鏈腑鏍囧師鍥�")
+ private String unbidReason;
+
+ @Schema(description = "鍚堝悓鍘熶欢绾﹀畾鍥炰紶鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate contractOriginalReturnDate;
+
+ @Schema(description = "鍏宠仈鍚堝悓ID鍒楄〃")
+ private List<Long> associatedContractIds;
}
--
Gitblit v1.9.3