From 89a5fedfe041ebacb2d81ecae1023b206cd3f353 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 四月 2025 09:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java
index d7cf570..b01acb4 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java
@@ -21,7 +21,9 @@
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.eims.domain.EimsMaintPlan;
import org.dromara.eims.domain.bo.EimsMaintPlanBo;
+import org.dromara.eims.domain.vo.EimsEquVo;
import org.dromara.eims.domain.vo.MaintOrdeGroupVo;
+import org.dromara.eims.mapper.EimsEquMapper;
import org.dromara.eims.mapper.EimsMaintPlanMapper;
import org.dromara.system.domain.SysDept;
import org.dromara.system.domain.vo.SysDeptVo;
@@ -49,6 +51,7 @@
private final EimsMaintOrderMapper baseMapper;
private final EimsMaintPlanMapper planMapper;
private final SysDeptMapper sysDeptMapper;
+ private final EimsEquMapper equMapper;
/**
* 鏌ヨ淇濆吇宸ュ崟
@@ -58,7 +61,13 @@
*/
@Override
public EimsMaintOrderVo queryById(Long id){
- return baseMapper.selectVoById(id);
+ EimsMaintOrderVo orderVo = baseMapper.selectVoById(id);
+ EimsEquVo equVo = equMapper.selectVoById(orderVo.getEquId());
+ if(equVo!=null){
+ orderVo.setEquName(equVo.getEquName());
+ orderVo.setAssetNo(equVo.getAssetNo());
+ }
+ return orderVo;
}
/**
--
Gitblit v1.9.3