调整

zhuguifei

2025-03-11 7cc3ac34f175e2dacc76a02fb66ae3ba9f747b55

 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;