From 9b6109daafb49ca14daf6d77964579ef5dc8ec0f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 16 五月 2026 11:10:20 +0800
Subject: [PATCH] fix:设备台账顺序更改
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..d4f6460 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,6 +1,7 @@
package com.ruoyi.sales.dto;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -13,12 +14,18 @@
@Data
public class SalesLedgerDto {
+
private Long id;
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;
@@ -41,7 +48,7 @@
private List<String> tempFileIds;
private List<CommonFile> SalesLedgerFiles;
- private Integer Type;
+ private Integer type;
@ApiModelProperty(value = "绛捐鏃ユ湡")
private LocalDate executionDate;
@@ -49,4 +56,11 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
+
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ private LocalDate deliveryDate;
+
+ @ApiModelProperty(value = "鏄惁鐢熶骇")
+ @JsonAlias("isProduce")
+ private Boolean produce;
}
--
Gitblit v1.9.3