From 587a27e7d6d8e0b8c4dcd6dcfc96282786715da2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 16:25:56 +0800
Subject: [PATCH] 主生产计划：计划完成时间改成date类型
---
src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java | 8 ++++----
doc/宁夏-中盛建材.sql | 2 +-
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 13 ++++---------
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index f51e9b0..e93612a 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -92,7 +92,7 @@
add assigned_quantity DECIMAL(10, 4) default 0 not null COMMENT '涓嬪彂鏁伴噺';
alter table product_order
- add plan_complete_time datetime(0) NULL DEFAULT NULL COMMENT '璁″垝瀹屾垚鏃堕棿';
+ add plan_complete_time date NULL DEFAULT NULL COMMENT '璁″垝瀹屾垚鏃堕棿';
# 鐢熶骇璁㈠崟涓庣敓浜ц鍒掑叧鑱旇〃
drop table if exists product_order_plan;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 0e06718..4f5a92e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -10,6 +10,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -36,18 +37,12 @@
private String npsNo;
/**
- * 鍚堝苟鐢熶骇璁″垝ids
- */
- @ApiModelProperty(value = "鍚堝苟鐢熶骇璁″垝ids")
- private String combineProductionPlanIds;
-
- /**
* 璁″垝瀹屾垚鏃堕棿
*/
@ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime planCompleteTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate planCompleteTime;
/**
* 绉熸埛id
diff --git a/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java b/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java
index e416d5b..69e2556 100644
--- a/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java
@@ -8,7 +8,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
import java.util.List;
@Data
@@ -20,7 +20,7 @@
private BigDecimal totalAssignedQuantity;
@ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime planCompleteTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate planCompleteTime;
}
--
Gitblit v1.9.3