From cf9fac40a8e39b25ee935a743224ae6c405bbddc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 24 三月 2025 19:33:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/java/com/zy/asrs/entity/StaDesc.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
index 9c61158..e0c8241 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -8,6 +8,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasWrkIotypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -287,5 +288,17 @@
this.appeTime = appeTime;
}
+ public String getTypeNo$() {
+ if (Cools.isEmpty(this.typeNo)){
+ return "";
+ }
+ BasWrkIotypeService basWrkIotypeService = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = basWrkIotypeService.selectById(this.typeNo);
+ if (basWrkIotype == null) {
+ return "";
+ }
+ return basWrkIotype.getIoDesc();
+ }
+
}
--
Gitblit v1.9.1