From 7cc3ac34f175e2dacc76a02fb66ae3ba9f747b55 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 11 三月 2025 08:14:20 +0800
Subject: [PATCH] 调整
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java | 36 +-----------------------------------
1 files changed, 1 insertions(+), 35 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 988fc92..472878a 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
@@ -15,13 +15,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
-import org.dromara.eims.domain.EimsMaintOrditm;
-import org.dromara.eims.domain.EimsMaintStand;
-import org.dromara.eims.domain.vo.EimsMaintPlanVo;
-import org.dromara.eims.domain.vo.EimsMaintStandVo;
-import org.dromara.eims.domain.vo.EimsRepairResVo;
-import org.dromara.eims.mapper.EimsMaintOrditmMapper;
-import org.dromara.eims.mapper.EimsMaintStandMapper;
+
import org.dromara.system.domain.SysDept;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.mapper.SysDeptMapper;
@@ -49,10 +43,8 @@
public class EimsMaintOrderServiceImpl implements IEimsMaintOrderService, MaintOrderService {
private final EimsMaintOrderMapper baseMapper;
- private final EimsMaintOrditmMapper orditmMapper;
private final SysDeptMapper sysDeptMapper;
- private final EimsMaintStandMapper standMapper;
/**
* 鏌ヨ淇濆吇宸ュ崟
*
@@ -168,21 +160,6 @@
if (flag) {
bo.setId(add.getId());
- //鐢熸垚淇濆吇鏄庣粏
- Long equId = bo.getEquId();
- List<EimsMaintStandVo> standList = standMapper.selectVoList(new LambdaQueryWrapper<EimsMaintStand>().eq(EimsMaintStand::getEquId, equId));
- //TODO 娌℃湁淇濆吇椤癸紝娣诲姞寮傚父璁板綍
- for (int j = 0; j < standList.size(); j++) {
- EimsMaintStandVo stand = standList.get(j);
- EimsMaintOrditm itm = new EimsMaintOrditm();
- itm.setOrderId(bo.getId());
- itm.setEquId(equId);
- itm.setItmName(stand.getName());
- itm.setItmAction(stand.getStand());
- itm.setItmUser(bo.getMaintUser());
- orditmMapper.insert(itm);
- }
-
}
return flag;
}
@@ -200,17 +177,6 @@
EimsMaintOrder update = MapstructUtils.convert(bo, EimsMaintOrder.class);
EimsMaintOrder old = baseMapper.selectById(bo.getId());
-
- // 淇濆吇鐘舵�佸彉鏇村緟瀹℃牳鏃堕渶瑕佹牎楠屼繚鍏婚」鏁版嵁
- if(old.getStatus().equals(DictConstants.MAINT_ORDER_STATUS_DETAIL.BAOYANG)&&bo.getStatus().equals(DictConstants.MAINT_ORDER_STATUS_DETAIL.DAIYANZHENG)){
- LambdaQueryWrapper<EimsMaintOrditm> itmQueryWrapper = Wrappers.lambdaQuery();
- itmQueryWrapper.eq(EimsMaintOrditm::getOrderId, bo.getId());
- List<EimsMaintOrditm> eimsMaintOrditms = orditmMapper.selectList(itmQueryWrapper);
- List<EimsMaintOrditm> wwc = eimsMaintOrditms.stream().filter(item->!item.getStatus().equals(DictConstants.EIMS_ORDITM_STATUS_DETAIL.YIWANCHENG)).toList();
- if(!wwc.isEmpty()){
- return false;
- }
- }
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
--
Gitblit v1.9.3