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/EimsMaintOrderServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 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 529c96b..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;
}
/**
@@ -112,6 +121,8 @@
qw.eq(bo.getStatus() != null, "mo.status", bo.getStatus());
qw.eq(bo.getPlanTime()!=null,
"mo.plan_time", bo.getPlanTime());
+ qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null,
+ "mo.plan_time", params.get("beginPlanTime"), params.get("endPlanTime"));
qw.orderByDesc("mo.create_time");
return qw;
}
@@ -174,6 +185,8 @@
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EimsMaintOrder::getStatus, bo.getStatus());
lqw.eq(bo.getPlanTime() != null, EimsMaintOrder::getPlanTime, bo.getPlanTime());
lqw.eq(bo.getPlanId() != null, EimsMaintOrder::getPlanId, bo.getPlanId());
+ // 鎸夊垱寤烘椂闂村�掑簭
+ lqw.orderByDesc(EimsMaintOrder::getCreateTime);
return lqw;
}
--
Gitblit v1.9.3