From 2c27abdc366d09cfa68f120ef22a1991dcf7a1ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 14:50:30 +0800
Subject: [PATCH] 完善bug
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 8009463..becd6a0 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -1,10 +1,13 @@
package com.ruoyi.procurementrecord.dto;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -16,11 +19,15 @@
private Integer id;
+ private Long createUser;
+
/**
* 鍏ュ簱鎵规
*/
@Excel(name = "鍏ュ簱鎵规")
private String inboundBatches;
+
+ private Long productModelId;
/**
* 鍚堝悓鍙�
@@ -35,19 +42,31 @@
@Excel(name = "鍏ュ簱鏁伴噺")
private BigDecimal inboundNum;
+ @Excel(name = "棰勮鏁伴噺")
+ private BigDecimal warnNum;
+
/**
* 寰呭嚭搴撴暟閲�
*/
- @Excel(name = "寰呭嚭搴撴暟閲�")
+// @Excel(name = "寰呭嚭搴撴暟閲�")
private BigDecimal inboundNum0;
/**
* 鍑哄叆搴撴椂闂�
*/
+// @Excel(name = "鍏ュ簱鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ private String timeStr;
+
+ /**
+ * 鍑哄叆搴撴椂闂�
+ */
@Excel(name = "鍏ュ簱鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
+ private String time;
+
/**
* 鍑哄叆搴撶敤鎴�
@@ -103,5 +122,35 @@
*/
@Excel(name = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
+ /**
+ * 鎶ヨ〃鏃ユ姤
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate reportDate;
+ /**
+ * 鎶ヨ〃鏈堟姤
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startMonth;
+ /**
+ * 鎶ヨ〃鏈堟姤
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endMonth;
+ /**
+ * 鎶ヨ〃鏈堟姤
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+ /**
+ * 鎶ヨ〃鏈堟姤
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
}
--
Gitblit v1.9.3