From 53bf1e11c46964e15ab2d334457066ed3b68c98d Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 06 六月 2025 12:57:57 +0800
Subject: [PATCH] refactor(lb-eims):调整代码和更新配置- 注释掉 EimsEquImportVo 中的 @ExcelProperty 注解 - 优化 EimsEquImportListener 中的异常日志输出- 更新 snailjob 监控页面的 iframe 源地址- 修改移动端项目的 API 基础 URL - 优化移动端页面跳转逻辑 - 改进维修请求列表的接单操作流程
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsFixtureServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsFixtureServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsFixtureServiceImpl.java
index efb2fad..85ec07e 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsFixtureServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsFixtureServiceImpl.java
@@ -20,6 +20,10 @@
import org.dromara.eims.domain.vo.EimsEquVo;
import org.dromara.eims.domain.vo.EimsFixtureTypeVo;
import org.dromara.eims.mapper.EimsFixtureTypeMapper;
+import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.SysDeptMapper;
+import org.dromara.system.mapper.SysUserMapper;
import org.springframework.stereotype.Service;
import org.dromara.eims.domain.bo.EimsFixtureBo;
import org.dromara.eims.domain.vo.EimsFixtureVo;
@@ -44,6 +48,8 @@
private final EimsFixtureMapper baseMapper;
private final EimsFixtureTypeMapper fixtureTypeMapper;
+ private final SysUserMapper userMapper;
+ private final SysDeptMapper deptMapper;
/**
* 鏌ヨ宸ュ叿(娌诲叿)鍙拌处
@@ -79,7 +85,25 @@
@Override
public List<EimsFixtureVo> queryList(EimsFixtureBo bo) {
LambdaQueryWrapper<EimsFixture> lqw = buildQueryWrapper(bo);
- return baseMapper.selectVoList(lqw);
+ List<EimsFixtureVo> fixtureList = baseMapper.selectVoList(lqw);
+ if(fixtureList!=null && !fixtureList.isEmpty()){
+ for (EimsFixtureVo fixtureVo : fixtureList) {
+ if(fixtureVo.getManageUser()!=null){
+ SysUserVo sysUserVo = userMapper.selectVoById(fixtureVo.getManageUser());
+ if(sysUserVo!=null){
+ fixtureVo.setManageUserName(sysUserVo.getNickName());
+ }
+ }
+
+ if(fixtureVo.getUseDept()!=null){
+ SysDeptVo deptVo = deptMapper.selectVoById(fixtureVo.getUseDept());
+ if(deptVo!=null){
+ fixtureVo.setUseDeptName(deptVo.getDeptName());
+ }
+ }
+ }
+ }
+ return fixtureList;
}
private LambdaQueryWrapper<EimsFixture> buildQueryWrapper(EimsFixtureBo bo) {
--
Gitblit v1.9.3