From 9af9ab79236d68112bec7138ee7f1b2461d20f68 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期一, 26 五月 2025 10:35:37 +0800
Subject: [PATCH] 完善工具导入导出
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsFixtureServiceImpl.java | 26 +++++++++++++++++++++++++-
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java | 10 ++++++++--
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java
index 352a83d..0f2ebf2 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java
@@ -92,16 +92,22 @@
/**
* 浣跨敤閮ㄩ棬
*/
+ private Long useDept;
+
@ExcelProperty(value = "浣跨敤閮ㄩ棬")
@ColumnWidth(20)
- private Long useDept;
+ @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "useDept")
+ private String useDeptName;
/**
* 绠＄悊浜�
*/
+ private Long manageUser;
+
@ExcelProperty(value = "绠＄悊浜�")
@ColumnWidth(12)
- private Long manageUser;
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "manageUser")
+ private String manageUserName;
/**
* 閲囪喘鏃ユ湡
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