From 48d6b46ef23a321cc70e20d36a2b3bf721d05206 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 15:45:57 +0800
Subject: [PATCH] 电视机显示屏曲线图改成7天
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 090d5d6..febdf60 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.LocAliasUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -70,6 +71,13 @@
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
@TableField("crn_no")
private Integer crnNo;
+
+ /**
+ * 搴撳尯锛�1=A鍖猴紝2=B鍖猴紝3=C鍖�
+ */
+ @ApiModelProperty(value= "搴撳尯")
+ @TableField("area_id")
+ private Integer areaId;
@ApiModelProperty(value= "")
@TableField("sheet_no")
@@ -216,6 +224,10 @@
@ApiModelProperty(value= "")
@TableField("exp_time")
private Double expTime;
+
+ @ApiModelProperty(value= "鑰楁椂(鍒嗛挓)")
+ @TableField("cost_time")
+ private Integer costTime;
@ApiModelProperty(value= "")
@TableField("ref_wrkno")
@@ -401,6 +413,10 @@
return null;
}
+ public String getAreaId$(){
+ return LocAliasUtils.areaName(this.areaId);
+ }
+
public String getWrkDate$(){
if (Cools.isEmpty(this.wrkDate)){
return "";
@@ -412,9 +428,9 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return LocAliasUtils.displayLocNo(locMast);
}
- return null;
+ return this.locNo;
}
public String getStaNo$(){
@@ -439,9 +455,9 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return LocAliasUtils.displayLocNo(locMast);
}
- return null;
+ return this.sourceLocNo;
}
public String getIoTime$(){
--
Gitblit v1.9.1