From 604bf600b33413dbf7c1cfb81ddf7762049fce20 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 14 一月 2022 10:24:37 +0800
Subject: [PATCH] 解决layui框架bug
---
src/main/java/zy/cloud/wms/manager/entity/Item.java | 108 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 89 insertions(+), 19 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..d0c4426 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -4,9 +4,15 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
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 +21,9 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
+@Data
@TableName("man_item")
public class Item implements Serializable {
@@ -85,6 +93,7 @@
*/
@ApiModelProperty(value= "寮�濮嬫椂闂�")
@TableField("start_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
@@ -92,12 +101,13 @@
*/
@ApiModelProperty(value= "缁撴潫鏃堕棿")
@TableField("end_time")
+ @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 +122,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -126,6 +137,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
@@ -134,25 +146,37 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField("type")
+ private String type;
+
+
+ @TableField("real_start_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realStartTime;
+
+
+ @TableField("real_end_time")
+ @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;
+
public Item() {}
- 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;
- }
+
// Item item = new Item(
// null, // 椤圭洰缂栧彿[闈炵┖]
@@ -172,6 +196,14 @@
// null // 澶囨敞
// );
+ 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 +232,7 @@
public String getUuid() {
return uuid;
}
+
public void setUuid(String uuid) {
this.uuid = uuid;
@@ -292,7 +325,9 @@
switch (this.status){
case 1:
return "姝ｅ父";
- case 0:
+ case 3:
+ return "瀹岀粨";
+ case 2:
return "绂佺敤";
default:
return String.valueOf(this.status);
@@ -347,6 +382,40 @@
}
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 getRealEndTime$(){
+ if (!Cools.isEmpty(this.realEndTime)) {
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").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;
@@ -376,4 +445,5 @@
}
+
}
--
Gitblit v1.9.1