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 | 127 +++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 46 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 402305c..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,6 +1,10 @@
package zy.cloud.wms.manager.entity;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
@@ -10,6 +14,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -36,9 +41,16 @@
import io.swagger.annotations.ApiModelProperty;
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;
@@ -46,6 +58,7 @@
/**
* 鍞竴ID
*/
+ @TableId(value = "id",type = IdType.AUTO)
@ApiModelProperty(value= "鍞竴ID")
private Long id;
@@ -55,6 +68,7 @@
@ApiModelProperty(value= "椤圭洰ID")
@TableId(value = "item_id", type = IdType.INPUT)
@TableField("item_id")
+
private Long itemId;
/**
@@ -76,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;
@@ -92,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;
@@ -100,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;
@@ -150,7 +165,7 @@
*/
@ApiModelProperty(value= "鍒涘缓浜篿d")
@TableField("create_id")
- private Integer createId;
+ private Long createId;
/**
* 淇敼鏃堕棿
@@ -165,7 +180,7 @@
*/
@ApiModelProperty(value= "淇敼浜篿d")
@TableField("modify_id")
- private Integer modifyId;
+ private Long modifyId;
/**
* 鑺傜偣鍚嶇О
@@ -175,26 +190,6 @@
private String flowName;
public ProjectPlan() {}
-
- public ProjectPlan(Long itemId,Integer weightNum,Integer flowId,Date startTime,Date realStartTime,Date endTime,Date realEndTime,Integer delay,String delayReason,String memo,String dutyDepartment,String dutyMan,Date createTime,Integer createId,Date modifyTime,Integer modifyId,String flowName) {
- this.itemId = itemId;
- this.weightNum = weightNum;
- this.flowId = flowId;
- this.startTime = startTime;
- this.realStartTime = realStartTime;
- this.endTime = endTime;
- this.realEndTime = realEndTime;
- this.delay = delay;
- this.delayReason = delayReason;
- this.memo = memo;
- this.dutyDepartment = dutyDepartment;
- this.dutyMan = dutyMan;
- this.createTime = createTime;
- this.createId = createId;
- this.modifyTime = modifyTime;
- this.modifyId = modifyId;
- this.flowName = flowName;
- }
// ProjectPlan projectPlan = new ProjectPlan(
// null, // 椤圭洰ID[闈炵┖]
@@ -216,6 +211,16 @@
// null // 鑺傜偣鍚嶇О
// );
+
+ 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;
}
@@ -256,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) {
@@ -271,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) {
@@ -286,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) {
@@ -301,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) {
@@ -363,13 +368,13 @@
this.createTime = createTime;
}
- public Integer getCreateId() {
- return createId;
- }
-
- public void setCreateId(Integer createId) {
- this.createId = createId;
- }
+// public Integer getCreateId() {
+// return createId;
+// }
+//
+// public void setCreateId(Integer createId) {
+// this.createId = createId;
+// }
public Date getModifyTime() {
return modifyTime;
@@ -385,14 +390,14 @@
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
-
- public Integer getModifyId() {
- return modifyId;
- }
-
- public void setModifyId(Integer modifyId) {
- this.modifyId = modifyId;
- }
+//
+// public Integer getModifyId() {
+// return modifyId;
+// }
+//
+// public void setModifyId(Integer modifyId) {
+// this.modifyId = modifyId;
+// }
public String getFlowName() {
return flowName;
@@ -402,5 +407,35 @@
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 getFlowId$(){
+ FlowStatusService bean = SpringUtils.getBean(FlowStatusService.class);
+ FlowStatus id = bean.selectOne(new EntityWrapper<FlowStatus>()
+ .eq("id", this.flowId));
+ if (!Cools.isEmpty(id)) {
+ return id.getName();
+ }
+ 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