From 88e10f5656a0ad5530a9e37892fb327153d9dc8a Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 27 六月 2025 13:25:35 +0800
Subject: [PATCH] feat(eims): 优化保养报表状态展示
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsFixtureServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 e6cf528..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
@@ -3,6 +3,7 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.dromara.common.core.service.FixtureService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -19,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;
@@ -39,10 +44,12 @@
*/
@RequiredArgsConstructor
@Service
-public class EimsFixtureServiceImpl implements IEimsFixtureService {
+public class EimsFixtureServiceImpl implements IEimsFixtureService, FixtureService {
private final EimsFixtureMapper baseMapper;
private final EimsFixtureTypeMapper fixtureTypeMapper;
+ private final SysUserMapper userMapper;
+ private final SysDeptMapper deptMapper;
/**
* 鏌ヨ宸ュ叿(娌诲叿)鍙拌处
@@ -78,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) {
@@ -100,6 +125,7 @@
lqw.eq(StringUtils.isNotBlank(bo.getFixtureDesc()), EimsFixture::getFixtureDesc, bo.getFixtureDesc());
lqw.eq(bo.getBorrowDept()!=null, EimsFixture::getBorrowDept, bo.getBorrowDept());
lqw.eq(bo.getBorrowUser()!=null, EimsFixture::getBorrowUser, bo.getBorrowUser());
+ lqw.eq(StringUtils.isNotEmpty(bo.getBorrowStatus()), EimsFixture::getBorrowStatus, bo.getBorrowStatus());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EimsFixture::getStatus, bo.getStatus());
lqw.like(StringUtils.isNotBlank(bo.getAssetNo()), EimsFixture::getAssetNo, bo.getAssetNo());
lqw.like(StringUtils.isNotBlank(bo.getModelNo()), EimsFixture::getModelNo, bo.getModelNo());
@@ -193,4 +219,15 @@
return baseMapper.deleteByIds(ids) > 0;
}
+ @Override
+ public String selectFixtureNameByIds(String fixIds) {
+ List<String> list = new ArrayList<>();
+ for (Long id : StringUtils.splitTo(fixIds, Convert::toLong)) {
+ EimsFixtureVo vo = SpringUtils.getAopProxy(this).queryById(id);
+ if (ObjectUtil.isNotNull(vo)) {
+ list.add(vo.getFixtureName());
+ }
+ }
+ return String.join(StringUtils.SEPARATOR, list);
+ }
}
--
Gitblit v1.9.3