From 453f63fd6cd6466222304df619e62b3a5667ca68 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 05 八月 2025 13:56:47 +0800
Subject: [PATCH] 修复0730测试问题
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 c85145d..22fba86 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
@@ -19,6 +19,7 @@
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.eims.domain.EimsEquStatu;
import org.dromara.eims.domain.EimsMaintPlan;
import org.dromara.eims.domain.EimsSpareInout;
import org.dromara.eims.domain.bo.EimsSpareBo;
@@ -116,6 +117,11 @@
qw.like(StringUtils.isNotBlank(bo.getMaintCode()),"mo.maint_code", bo.getMaintCode());
qw.like(bo.getEquName() != null, "equ.equ_name", bo.getEquName());
qw.like(bo.getEquId() != null, "equ.equ_id", bo.getEquId());
+ if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
+ qw.and( wq ->wq.like("equ.equ_name", params.get("searchValue"))
+ .or().like("equ.asset_no", params.get("searchValue"))
+ );
+ }
qw.eq(StringUtils.isNotBlank(bo.getMaintType()), "mo.maint_type", bo.getMaintType());
qw.eq(StringUtils.isNotBlank(bo.getMaintCycleUnit()), "mo.maint_cycle_unit", bo.getMaintCycleUnit());
qw.eq(StringUtils.isNotBlank(bo.getMaintRule()), "mo.maint_rule", bo.getMaintRule());
@@ -186,7 +192,7 @@
lqw.eq(bo.getMaintDept() != null, EimsMaintOrder::getMaintDept, bo.getMaintDept());
lqw.eq(StringUtils.isNotBlank(bo.getMaintCode()), EimsMaintOrder::getMaintCode, bo.getMaintCode());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EimsMaintOrder::getStatus, bo.getStatus());
- lqw.eq(bo.getPlanTime() != null, EimsMaintOrder::getPlanTime, bo.getPlanTime());
+ lqw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null,EimsMaintOrder::getPlanTime,params.get("beginPlanTime"), params.get("endPlanTime"));
lqw.eq(bo.getPlanId() != null, EimsMaintOrder::getPlanId, bo.getPlanId());
// 鎸夊垱寤烘椂闂村�掑簭
lqw.orderByDesc(EimsMaintOrder::getCreateTime);
@@ -306,9 +312,18 @@
LoginUser loginUser = LoginHelper.getLoginUser();
List<EimsMaintOrder> list = MapstructUtils.convert(bo.getMaintOrderList(), EimsMaintOrder.class);
list.forEach(e -> {
- e.setStatus(DictConstants.MAINT_ORDER_STATUS_DETAIL.DAIYANZHENG);
+ // 鐘舵�佺敱鍓嶇浼犺繃鏉�
+ // e.setStatus(DictConstants.MAINT_ORDER_STATUS_DETAIL.DAIYANZHENG);
e.setEndTime(new Date());
- e.setMaintUser(loginUser.getUserId());
+ // 淇濆吇(1)-> 寰呴獙璇�(2)
+ if(e.getMaintUser()==null && (e.getStatus()!=null && e.getStatus().equals("2"))){
+ e.setMaintUser(loginUser.getUserId());
+ }
+ // 寰呯‘璁�(2)-> 瀹屾垚(3)
+ if(e.getVerifyUser()==null && (e.getStatus()!=null && e.getStatus().equals("3"))){
+ e.setVerifyUser(loginUser.getUserId());
+ }
+
e.setUpdateTime(new Date());
});
bo.getMaintOrderList().forEach(item -> {
--
Gitblit v1.9.3