From 1cea8144b4ddd9ed19f8e2542b5374ca13c030f4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 22 十二月 2023 15:42:44 +0800
Subject: [PATCH] Merge branch 'hzjzwms' of http://47.97.1.152:5880/r/zy-asrs into tzhnewms
---
src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
index 26bdcc6..665d316 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -31,13 +32,19 @@
private Date createTime;
@ExcelProperty("瑙勬牸")
private String specs;
- @ExcelProperty("搴撳瓨涓婇檺")
+ @ExcelProperty("鎵规")
+ private String batch;
+ @ExcelProperty("璐т富Id")
+ private String owner;
+ @ExcelProperty("璐т富")
+ private String ownerName;
+// @ExcelProperty("搴撳瓨涓婇檺")
private String inventoryMax;
- @ExcelProperty("搴撳瓨涓嬮檺")
+// @ExcelProperty("搴撳瓨涓嬮檺")
private String inventoryMin;
@ExcelProperty("搴撻緞涓婇檺")
private String inventoryAgeMax;
- @ExcelProperty("搴撳瓨鎬绘暟閲�")
+// @ExcelProperty("搴撳瓨鎬绘暟閲�")
private Integer countAnfme;
@ExcelProperty("鍦ㄥ簱澶╂暟")
private Integer diffTime;
@@ -49,6 +56,24 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
+ public String getOwnerName(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1