Merge remote-tracking branch 'origin/main'

baoshiwei

2025-04-24 89a5fedfe041ebacb2d81ecae1023b206cd3f353

 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;
    }

    /**