From 320ed3f4782f9662f79ecfe14d2cf3f34dd288c5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 01 八月 2023 19:52:36 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 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 179c69c..54a2dc7 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;
@@ -42,11 +43,14 @@
import com.baomidou.mybatisplus.annotations.TableName;
import zy.cloud.wms.manager.service.FlowStatusService;
import zy.cloud.wms.manager.service.ItemService;
+import zy.cloud.wms.system.entity.Dept;
+import zy.cloud.wms.system.service.DeptService;
import java.io.Serializable;
@Data
@TableName("sys_project_plan")
+
public class ProjectPlan implements Serializable {
private static final long serialVersionUID = 1L;
@@ -64,6 +68,7 @@
@ApiModelProperty(value= "椤圭洰ID")
@TableId(value = "item_id", type = IdType.INPUT)
@TableField("item_id")
+
private Long itemId;
/**
@@ -85,15 +90,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 +107,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 +115,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;
@@ -206,6 +212,15 @@
// );
+ public String getItemId$(){
+ ItemService bean = SpringUtils.getBean(ItemService.class);
+ Item id = bean.selectOne(new EntityWrapper<Item>()
+ .eq("id", this.itemId));
+ if (!Cools.isEmpty(id)) {
+ return id.getName();
+ }
+ return null;
+ }
public Long getId() {
return id;
}
@@ -246,7 +261,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) {
@@ -261,7 +276,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) {
@@ -276,7 +291,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) {
@@ -291,7 +306,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) {
@@ -392,17 +407,17 @@
this.flowName = flowName;
}
- public String getItemId$(){
- ItemService itemService = SpringUtils.getBean(ItemService.class);
- Item id = itemService.selectOne(new EntityWrapper<Item>()
- .eq("id", this.getItemId()));
- if (!Cools.isEmpty(id)) {
-
- return id.getName();
- }else {
- return null;
- }
- }
+// public String getItemId$(){
+// ItemService itemService = SpringUtils.getBean(ItemService.class);
+// Item id = itemService.selectOne(new EntityWrapper<Item>()
+// .eq("id", this.getItemId()));
+// if (!Cools.isEmpty(id)) {
+//
+// return id.getName();
+// }else {
+// return null;
+// }
+// }
public String getFlowId$(){
FlowStatusService bean = SpringUtils.getBean(FlowStatusService.class);
FlowStatus id = bean.selectOne(new EntityWrapper<FlowStatus>()
@@ -412,4 +427,15 @@
}
return null;
}
+
+ public String getDutyDepartment$(){
+ DeptService bean = SpringUtils.getBean(DeptService.class);
+ Dept id1 = bean.selectOne(new EntityWrapper<Dept>()
+ .eq("id", this.dutyDepartment));
+ if (id1 != null){
+ return id1.getName();
+ }else {
+ return "";
+ }
+ }
}
--
Gitblit v1.9.1