From 03a853465a52d4150acc261406f3c84b4d0f0b22 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 05 九月 2022 17:40:11 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/Item.java | 529 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 505 insertions(+), 24 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index ffc584b..38a2ed1 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -3,10 +3,17 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import zy.cloud.wms.manager.service.CstmrService;
+import zy.cloud.wms.manager.service.ProjectStatusService;
+import zy.cloud.wms.manager.service.ProjectTypeService;
import zy.cloud.wms.system.entity.Host;
import zy.cloud.wms.system.entity.User;
import zy.cloud.wms.system.service.HostService;
@@ -15,7 +22,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
-
+@Data
@TableName("man_item")
public class Item implements Serializable {
@@ -84,20 +91,22 @@
* 寮�濮嬫椂闂�
*/
@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("end_time")
+ @TableField(value = "end_time" ,strategy = FieldStrategy.IGNORED)
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 瀹岀粨 ")
private Integer status;
/**
@@ -112,6 +121,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -126,6 +136,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
@@ -134,25 +145,242 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public Item() {}
+ @TableField("type")
+ private String type;
- public Item(Long hostId, String uuid,String name,String inUuid,String cstmrUuid,String cstmr,String member,String leader,Date startTime,Date endTime,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.hostId = hostId;
- this.name = name;
- this.inUuid = inUuid;
- this.cstmrUuid = cstmrUuid;
- this.cstmr = cstmr;
- this.member = member;
- this.leader = leader;
- this.startTime = startTime;
- this.endTime = endTime;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
+
+ @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realStartTime;
+
+
+ @TableField(value = "real_end_time", strategy = FieldStrategy.IGNORED)
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realEndTime;
+
+ @TableField("real_month")
+ private Integer realMonth;
+
+ @TableField("duty_department")
+ private String dutyDepartment;
+
+ @TableField("duty_man")
+ private String dutyMan;
+
+ @TableField("origin_area")
+ private String originArea;
+
+ @TableField("project_status")
+ private Integer projectStatus;
+
+ /**
+ * 璁㈠崟绫诲瀷
+ */
+ @ApiModelProperty(value= "璁㈠崟绫诲瀷")
+ @TableField("orderDesc")
+ private String orderDesc;
+
+ /**
+ * 涓氬姟鍛�
+ */
+ @ApiModelProperty(value= "涓氬姟鍛�")
+ @TableField("salesman")
+ private String salesman;
+
+ /**
+ * 鍞墠鏍镐环閲戦
+ */
+ @ApiModelProperty(value= "鍞墠鏍镐环閲戦")
+ @TableField("presaleAmt")
+ private Double presaleAmt;
+
+ /**
+ * 閿�鍞浜よ揣鏈�
+ */
+ @ApiModelProperty(value= "閿�鍞浜よ揣鏈�")
+ @TableField("predeDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date predeDate;
+
+ /**
+ * 閿�鍞瀹夎鏈�
+ */
+ @ApiModelProperty(value= "閿�鍞瀹夎鏈�")
+ @TableField("preinDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date preinDate;
+
+ /**
+ * 浜у搧閲嶉噺
+ */
+ @ApiModelProperty(value= "浜у搧閲嶉噺")
+ @TableField("weight")
+ private Double weight;
+
+ /**
+ * 鏄惁瀹夎
+ */
+ @ApiModelProperty(value= "瀹夎")
+ @TableField("installMk")
+ private Integer installMk;
+
+ /**
+ * 鏄惁杩愯緭
+ */
+ @ApiModelProperty(value= "杩愯緭")
+ @TableField("deliveryMk")
+ private Integer deliveryMk;
+
+ /**
+ * 瀹㈡埛鑱旂郴浜�
+ */
+ @ApiModelProperty(value= "瀹㈡埛鑱旂郴浜�")
+ @TableField("custMan")
+ private String custMan;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
+ @TableField("custMobile")
+ private String custMobile;
+
+ /**
+ * 鑱旂郴鍦板潃
+ */
+ @ApiModelProperty(value= "鑱旂郴鍦板潃")
+ @TableField("custAdress")
+ private String custAdress;
+
+ /**
+ * 杩涘害
+ */
+ @ApiModelProperty(value= "杩涘害")
+ @TableField("progressRate")
+ private String progressRate;
+
+ /**
+ * 杞﹁締淇℃伅
+ */
+ @ApiModelProperty(value= "杞﹁締淇℃伅")
+ @TableField("planCarInfo")
+ private String planCarInfo;
+
+ /**
+ * 棰勮鍙戣揣鏃ユ湡
+ */
+ @ApiModelProperty(value= "棰勮鍙戣揣鏃ユ湡")
+ @TableField("plandeDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date plandeDate;
+
+ /**
+ * 瀹為檯鍙戣揣鏃ユ湡
+ */
+ @ApiModelProperty(value= "瀹為檯鍙戣揣鏃ユ湡")
+ @TableField("realdeDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realdeDate;
+
+ /**
+ * 棰勮瀹夎鏃ユ湡
+ */
+ @ApiModelProperty(value= "棰勮瀹夎鏃ユ湡")
+ @TableField("planinDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date planinDate;
+
+ /**
+ * 瀹為檯瀹夎鏃ユ湡
+ */
+ @ApiModelProperty(value= "瀹為檯瀹夎鏃ユ湡")
+ @TableField("realinDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realinDate;
+
+ /**
+ * 棰勮杩愯垂
+ */
+ @ApiModelProperty(value= "棰勮杩愯垂")
+ @TableField("plandeAmt")
+ private Double plandeAmt;
+
+ /**
+ * 瀹為檯杩愯垂
+ */
+ @ApiModelProperty(value= "瀹為檯杩愯垂")
+ @TableField("realdeAmt")
+ private Double realdeAmt;
+
+ /**
+ * 棰勮瀹夎璐�
+ */
+ @ApiModelProperty(value= "棰勮瀹夎璐�")
+ @TableField("planinAmt")
+ private Double planinAmt;
+
+ /**
+ * 瀹為檯瀹夎璐�
+ */
+ @ApiModelProperty(value= "瀹為檯瀹夎璐�")
+ @TableField("realinAmt")
+ private Double realinAmt;
+
+ /**
+ * 棰勮鍒濋獙鏃ユ湡
+ */
+ @ApiModelProperty(value= "棰勮鍒濋獙鏃ユ湡")
+ @TableField("planFADate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date planFADate;
+
+ /**
+ * 瀹為檯鍒濋獙鏃ユ湡
+ */
+ @ApiModelProperty(value= "瀹為檯鍒濋獙鏃ユ湡")
+ @TableField("realFADate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realFADate;
+
+ /**
+ * 棰勮缁堥獙鏃ユ湡
+ */
+ @ApiModelProperty(value= "棰勮缁堥獙鏃ユ湡")
+ @TableField("planLADate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date planLADate;
+
+ /**
+ * 瀹為檯缁堥獙鏃ユ湡
+ */
+ @ApiModelProperty(value= "瀹為檯缁堥獙鏃ユ湡")
+ @TableField("realLADate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realLADate;
+
+
+ /**
+ * 棰勮杞﹁締鏁伴噺
+ */
+ @ApiModelProperty(value= "棰勮杞﹁締鏁伴噺")
+ @TableField("planCarnumber")
+ private String planCarnumber;
+
+ /**
+ * 瓒呭嚭閲戦
+ */
+ @ApiModelProperty(value= "瓒呭嚭閲戦")
+ @TableField("Excess_amount")
+ private Double excessAmount;
+
+ /**
+ * 瓒呭嚭澶╂暟
+ */
+ @ApiModelProperty(value= "瓒呭嚭澶╂暟")
+ @TableField("Excess_time")
+ private Integer excessTime;
+
+ public Item() {}
// Item item = new Item(
// null, // 椤圭洰缂栧彿[闈炵┖]
@@ -172,6 +400,25 @@
// null // 澶囨敞
// );
+// public String getProgressRate$(){
+// ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
+// ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
+// .eq("id", this.progressRate));
+// if (!Cools.isEmpty(id)) {
+// return id.getStatusName();
+// }
+//
+// return "";
+// }
+
+ public String getProjectStatus$(){
+ ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
+ ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));
+ if (!Cools.isEmpty(this.id)) {
+ return id.getStatusName();
+ }
+ return null;
+ }
public Long getId() {
return id;
}
@@ -200,6 +447,7 @@
public String getUuid() {
return uuid;
}
+
public void setUuid(String uuid) {
this.uuid = uuid;
@@ -264,6 +512,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
}
+ public String getStartTime0$(){
+ if (Cools.isEmpty(this.startTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.startTime);
+ }
+
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
@@ -277,6 +532,12 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ }
+ public String getEndTime0$(){
+ if (Cools.isEmpty(this.endTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.endTime);
}
public void setEndTime(Date endTime) {
@@ -292,10 +553,38 @@
switch (this.status){
case 1:
return "姝ｅ父";
- case 0:
+ case 3:
+ return "瀹岀粨";
+ case 2:
return "绂佺敤";
default:
return String.valueOf(this.status);
+ }
+ }
+
+ public String getInstallMk$(){
+ if (null == this.installMk){ return null; }
+ switch (this.installMk){
+ case 0:
+ return "鍚�";
+ case 1:
+ return "鏄�";
+
+ default:
+ return String.valueOf(this.installMk);
+ }
+ }
+
+ public String getDeliveryMk$(){
+ if (null == this.deliveryMk){ return null; }
+ switch (this.deliveryMk){
+ case 0:
+ return "鍚�";
+ case 1:
+ return "鏄�";
+
+ default:
+ return String.valueOf(this.deliveryMk);
}
}
@@ -347,6 +636,58 @@
}
return null;
}
+ public String getCstmrUuid$(){
+ CstmrService bean = SpringUtils.getBean(CstmrService.class);
+ Cstmr id = bean.selectOne(new EntityWrapper<Cstmr>()
+ .eq("id", this.cstmrUuid));
+ if (!Cools.isEmpty(id)) {
+ return id.getName();
+ }
+ return null;
+ }
+
+ public String getRealStartTime$(){
+ if (!Cools.isEmpty(this.realStartTime)) {
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realStartTime);
+ }else {
+ return "";
+ }
+
+ }
+
+ public String getRealStartTime0$(){
+ if (!Cools.isEmpty(this.realStartTime)) {
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realStartTime);
+ }else {
+ return "";
+ }
+
+ }
+
+ public String getRealEndTime$(){
+ if (!Cools.isEmpty(this.realEndTime)) {
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realEndTime);
+ }else {
+ return "";
+ }
+ }
+ public String getRealEndTime0$(){
+ if (!Cools.isEmpty(this.realEndTime)) {
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realEndTime);
+ }else {
+ return "";
+ }
+ }
+
+ public String getType$(){
+ ProjectTypeService bean = SpringUtils.getBean(ProjectTypeService.class);
+ ProjectType id = bean.selectOne(new EntityWrapper<ProjectType>()
+ .eq("id", this.type));
+ if (!Cools.isEmpty(id)) {
+ return id.getTypeName();
+ }
+ return null;
+ }
public void setUpdateBy(Long updateBy) {
this.updateBy = updateBy;
@@ -375,5 +716,145 @@
this.memo = memo;
}
+ public String getPredeDate$(){
+ if (Cools.isEmpty(this.predeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.predeDate);
+ }
-}
+ public String getPredeDate0$(){
+ if (Cools.isEmpty(this.predeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.predeDate);
+ }
+
+ public String getPreinDate$(){
+ if (Cools.isEmpty(this.preinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.preinDate);
+ }
+
+ public String getPreinDate0$(){
+ if (Cools.isEmpty(this.preinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.preinDate);
+ }
+
+ public String getPlandeDate$(){
+ if (Cools.isEmpty(this.plandeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plandeDate);
+ }
+
+ public String getPlandeDate0$(){
+ if (Cools.isEmpty(this.plandeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.plandeDate);
+ }
+
+ public String getRealdeDate$(){
+ if (Cools.isEmpty(this.realdeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realdeDate);
+ }
+
+ public String getRealdeDate0$(){
+ if (Cools.isEmpty(this.realdeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realdeDate);
+ }
+
+ public String getPlaninDate$(){
+ if (Cools.isEmpty(this.planinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planinDate);
+ }
+
+ public String getPlaninDate0$(){
+ if (Cools.isEmpty(this.planinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.planinDate);
+ }
+
+ public String getRealinDate$(){
+ if (Cools.isEmpty(this.realinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realinDate);
+ }
+
+ public String getRealinDate0$(){
+ if (Cools.isEmpty(this.realinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realinDate);
+ }
+
+ public String getPlanFADate$(){
+ if (Cools.isEmpty(this.planFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planFADate);
+ }
+
+ public String getPlanFADate0$(){
+ if (Cools.isEmpty(this.planFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.planFADate);
+ }
+
+ public String getRealFADate$(){
+ if (Cools.isEmpty(this.realFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realFADate);
+ }
+
+ public String getRealFADate0$(){
+ if (Cools.isEmpty(this.realFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realFADate);
+ }
+
+ public String getPlanLADate$(){
+ if (Cools.isEmpty(this.planLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planLADate);
+ }
+
+ public String getPlanLADate0$(){
+ if (Cools.isEmpty(this.planLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.planLADate);
+ }
+
+ public String getRealLADate$(){
+ if (Cools.isEmpty(this.realLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realLADate);
+ }
+
+ public String getRealLADate0$(){
+ if (Cools.isEmpty(this.realLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realLADate);
+ }
+
+
+}
\ No newline at end of file
--
Gitblit v1.9.1