From 69d68078402cd2029336a9e25fd78e4501bf2a80 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 23 六月 2024 10:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index cd07a21..b4e7076 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.WrkMastLogService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -358,5 +360,20 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getIoType$(){
+ if (Cools.isEmpty(this.wrkNo) || Cools.isEmpty(this.ioTime)){
+ return "";
+ }
+ WrkMastLogService wrkMastLogService = SpringUtils.getBean(WrkMastLogService.class);
+ EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+ wrapper.eq("wrk_no", wrkNo);
+ wrapper.eq("io_time", ioTime);
+ WrkMastLog wrkMastLog = wrkMastLogService.selectOne(wrapper);
+ if (Cools.isEmpty(wrkMastLog)){
+ return "";
+ }
+ return wrkMastLog.getIoType$();
+ }
+
}
--
Gitblit v1.9.1