From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
index 6ce0309..30099b0 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.entity;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -47,6 +48,7 @@
@Data
@TableName("sys_project_plan")
+
public class ProjectPlan implements Serializable {
private static final long serialVersionUID = 1L;
@@ -64,6 +66,7 @@
@ApiModelProperty(value= "椤圭洰ID")
@TableId(value = "item_id", type = IdType.INPUT)
@TableField("item_id")
+
private Long itemId;
/**
@@ -85,15 +88,16 @@
* 鍚姩鏃ユ湡
*/
@ApiModelProperty(value= "鍚姩鏃ユ湡")
- @TableField("start_time")
+ @TableField(value = "start_time",strategy = FieldStrategy.IGNORED)
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+
private Date startTime;
/**
* 瀹為檯鍚姩鏃ユ湡
*/
@ApiModelProperty(value= "瀹為檯鍚姩鏃ユ湡")
- @TableField("real_start_time")
+ @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date realStartTime;
@@ -101,7 +105,7 @@
* 缁撴潫鏃ユ湡
*/
@ApiModelProperty(value= "缁撴潫鏃ユ湡")
- @TableField("end_time")
+ @TableField(value = "end_time", strategy = FieldStrategy.IGNORED)
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime;
@@ -109,7 +113,7 @@
* 瀹為檯缁撴潫鏃ユ湡
*/
@ApiModelProperty(value= "瀹為檯缁撴潫鏃ユ湡")
- @TableField("real_end_time")
+ @TableField(value = "real_end_time", strategy = FieldStrategy.IGNORED)
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date realEndTime;
@@ -255,7 +259,7 @@
if (Cools.isEmpty(this.startTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.startTime);
}
public void setStartTime(Date startTime) {
@@ -270,7 +274,7 @@
if (Cools.isEmpty(this.realStartTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realStartTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realStartTime);
}
public void setRealStartTime(Date realStartTime) {
@@ -285,7 +289,7 @@
if (Cools.isEmpty(this.endTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.endTime);
}
public void setEndTime(Date endTime) {
@@ -300,7 +304,7 @@
if (Cools.isEmpty(this.realEndTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realEndTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realEndTime);
}
public void setRealEndTime(Date realEndTime) {
--
Gitblit v1.9.1