From 86b776e14070d7e00471b591a5325104772e7fc4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 09:58:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 3f57720..291a8c0 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -18,12 +19,28 @@
private String projectName;
@JsonFormat(pattern = "yyyy-MM-dd")
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<String> tempFileIds;
@@ -33,5 +50,18 @@
@ApiModelProperty(value = "绛捐鏃ユ湡")
private LocalDate executionDate;
- private Integer status;
+ private Boolean status;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @ApiModelProperty(value = "璁㈠崟鎸夌揣鎬ョ▼搴﹀垎绫�(鏅��/绱ф��)")
+ private String salesType;
+
+ @ApiModelProperty(value = "1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触")
+ //榛樿鏄�1
+ private Integer approvalStatus;
+
+ // 瀹℃壒浜�
+ private String approveUserIds;
}
--
Gitblit v1.9.3