From 684e4306a08feeae188070f264148e6765da8dcf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 20 九月 2026 19:25:15 +0800
Subject: [PATCH] feat(account): 更新往来付款回款流水表及接口
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index aeea446..43f638e 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,11 +1,15 @@
package com.ruoyi.sales.dto;
+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.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -16,22 +20,76 @@
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;
+ private String entryDateEnd;
+
+
private String salesman;
private Long customerId;
private String customerName;
private String entryPerson;
private String remarks;
private String attachmentMaterials;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate issueDate;
+
+ @TableField(exist = false)
+ private String invoiceNo;
+ @TableField(exist = false)
+ private String createUser;
+
+
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;
+
+ @Schema(description = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @Schema(description = "浜よ揣鏃ユ湡")
+ private LocalDate deliveryDate;
+
+ private List<StorageBlobDTO> storageBlobDTOs;
+ private List<StorageBlobVO> StorageBlobVOs;
+
+ /**
+ * 閿�鍞被鍨嬶細鍗栨补 / 浠ｅ偍
+ * 娉ㄦ剰锛氫笉瑕佸鐢ㄤ笂闈㈢殑 type锛岄偅涓槸瀛愯〃琛岀殑 SaleEnum(閿�鍞�/閲囪喘/椤圭洰)锛岃惤 sales_ledger_product.type
+ */
+ @Schema(description = "閿�鍞被鍨嬶細鍗栨补/浠ｅ偍")
+ private String ledgerType;
+
+ @Schema(description = "娌瑰簱id锛堢被鍨�=浠ｅ偍鏃朵娇鐢級")
+ private Long oilDepotId;
+
+ @Schema(description = "娌瑰簱鍚嶇О")
+ private String oilDepotName;
+
+ @Schema(description = "鍌ㄧ綈id锛堢被鍨�=浠ｅ偍鏃朵娇鐢級")
+ private Long tankId;
+
+ @Schema(description = "鍌ㄧ綈鍙�")
+ private String tankNo;
+
+ @Schema(description = "瀹℃壒鐘舵�侊細寰呭鎵�/瀹℃牳涓�/閫氳繃/鎷掔粷")
+ private String approvalStatus;
+
+ /**
+ * 鍚堝悓閲戦銆傚崠娌圭殑閲戦鐢变骇鍝佹槑缁嗘眹鎬讳骇鐢燂紱浠ｅ偍娌℃湁鏄庣粏锛岀敱鍓嶇鎵嬪伐濉啓
+ */
+ @Schema(description = "鍚堝悓閲戦")
+ private BigDecimal contractAmount;
}
--
Gitblit v1.9.3