From ec8d7cbe79f8c012f0d855e19fee9dc8cd27608f Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:54 +0800
Subject: [PATCH] 1.各生产订单的完成进度统计接口 2.在制品周转情况接口 3.生产报工记录添加上生产时间字段

---
 src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java |   11 ++++++++---
 1 files changed, 8 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..bd19d51 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -17,8 +17,13 @@
     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 +46,7 @@
     private List<String> tempFileIds;
     private List<CommonFile> SalesLedgerFiles;
 
-    private Integer Type;
+    private Integer type;
     @ApiModelProperty(value = "绛捐鏃ユ湡")
     private LocalDate executionDate;
 

--
Gitblit v1.9.3