From 51a1786ef3e4e016d5f3f7bad8c2e2e8a84247a6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 22 三月 2026 18:42:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocMast.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 491cc28..c932542 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasLocStsService;
@@ -11,6 +11,7 @@
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -27,7 +28,6 @@
*/
@ApiModelProperty(value= "搴撲綅鍙�")
@TableId(value = "loc_no", type = IdType.INPUT)
- @TableField("loc_no")
private String locNo;
@ApiModelProperty(value= "搴撲綅鐘舵��")
@@ -70,6 +70,7 @@
@ApiModelProperty(value= "")
@TableField("io_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date ioTime;
/**
@@ -84,6 +85,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
@@ -98,10 +100,12 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date appeTime;
@ApiModelProperty(value= "")
@TableField("error_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date errorTime;
@ApiModelProperty(value= "")
@@ -122,7 +126,7 @@
public String getLocSts$(){
BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
- BasLocSts basLocSts = service.selectById(this.locSts);
+ BasLocSts basLocSts = service.getById(this.locSts);
if (!Cools.isEmpty(basLocSts)){
return String.valueOf(basLocSts.getLocDesc());
}
@@ -180,7 +184,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -196,7 +200,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -217,4 +221,18 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ public String getStatus$() {
+ if (this.status == null) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
}
--
Gitblit v1.9.1