feat(report): 新增设备稼动率统计功能

baoshiwei

2025-07-02 2f0009c750de4d47a18cce4a5a403fa83ba0c209

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsFixtureServiceImpl.java

@@ -3,6 +3,7 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.dromara.common.core.service.FixtureService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -19,6 +20,10 @@
import org.dromara.eims.domain.vo.EimsEquVo;
import org.dromara.eims.domain.vo.EimsFixtureTypeVo;
import org.dromara.eims.mapper.EimsFixtureTypeMapper;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysDeptMapper;
import org.dromara.system.mapper.SysUserMapper;
import org.springframework.stereotype.Service;
import org.dromara.eims.domain.bo.EimsFixtureBo;
import org.dromara.eims.domain.vo.EimsFixtureVo;
@@ -39,10 +44,12 @@
 */
@RequiredArgsConstructor
@Service
public class EimsFixtureServiceImpl implements IEimsFixtureService {
public class EimsFixtureServiceImpl implements IEimsFixtureService, FixtureService {

    private final EimsFixtureMapper baseMapper;
    private final EimsFixtureTypeMapper fixtureTypeMapper;
    private final SysUserMapper userMapper;
    private final SysDeptMapper deptMapper;

    /**
     * 查询工具(治具)台账
@@ -78,7 +85,25 @@
    @Override
    public List<EimsFixtureVo> queryList(EimsFixtureBo bo) {
        LambdaQueryWrapper<EimsFixture> lqw = buildQueryWrapper(bo);
        return baseMapper.selectVoList(lqw);
        List<EimsFixtureVo> fixtureList = baseMapper.selectVoList(lqw);
        if(fixtureList!=null && !fixtureList.isEmpty()){
            for (EimsFixtureVo fixtureVo : fixtureList) {
                if(fixtureVo.getManageUser()!=null){
                    SysUserVo sysUserVo = userMapper.selectVoById(fixtureVo.getManageUser());
                    if(sysUserVo!=null){
                        fixtureVo.setManageUserName(sysUserVo.getNickName());
                    }
                }

                if(fixtureVo.getUseDept()!=null){
                    SysDeptVo deptVo = deptMapper.selectVoById(fixtureVo.getUseDept());
                    if(deptVo!=null){
                        fixtureVo.setUseDeptName(deptVo.getDeptName());
                    }
                }
            }
        }
        return fixtureList;
    }

    private LambdaQueryWrapper<EimsFixture> buildQueryWrapper(EimsFixtureBo bo) {
@@ -194,4 +219,15 @@
        return baseMapper.deleteByIds(ids) > 0;
    }

    @Override
    public String selectFixtureNameByIds(String fixIds) {
        List<String> list = new ArrayList<>();
        for (Long id : StringUtils.splitTo(fixIds, Convert::toLong)) {
            EimsFixtureVo vo = SpringUtils.getAopProxy(this).queryById(id);
            if (ObjectUtil.isNotNull(vo)) {
                list.add(vo.getFixtureName());
            }
        }
        return String.join(StringUtils.SEPARATOR, list);
    }
}