完成维修工单查看维修记录子表

zhuguifei

2025-02-27 ec4d16c8a630960a4671a60f4d1957fd3de9def3

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.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 lombok.SneakyThrows;
import org.dromara.common.core.constant.DictConstants;
import org.dromara.common.core.service.RepairResService;
import org.dromara.common.core.utils.MapstructUtils;
@@ -14,10 +15,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.eims.domain.EimsEqu;
import org.dromara.eims.domain.EimsFixture;
import org.dromara.eims.domain.EimsRepairReq;
import org.dromara.eims.domain.*;
import org.dromara.eims.domain.vo.EimsRepairReqVo;
import org.dromara.eims.mapper.EimsRepairRecordMapper;
import org.dromara.eims.mapper.EimsRepairReqMapper;
import org.dromara.eims.utils.DataFilterUtil;
import org.dromara.system.domain.SysDept;
@@ -26,15 +26,11 @@
import org.springframework.stereotype.Service;
import org.dromara.eims.domain.bo.EimsRepairResBo;
import org.dromara.eims.domain.vo.EimsRepairResVo;
import org.dromara.eims.domain.EimsRepairRes;
import org.dromara.eims.mapper.EimsRepairResMapper;
import org.dromara.eims.service.IEimsRepairResService;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.*;

/**
 * 维修工单Service业务层处理
@@ -49,6 +45,7 @@
    private final EimsRepairResMapper baseMapper;
    private final EimsRepairReqMapper reqMapper;
    private final SysDeptMapper deptMapper;
    private final EimsRepairRecordMapper recordMapper;

    /**
     * 查询维修工单
@@ -121,8 +118,55 @@
            reqVo.setStatus(DictConstants.REPAIR_REQ_STATUS_DETAIL.WEIXIU);
            EimsRepairReq req = MapstructUtils.convert(reqVo, EimsRepairReq.class);
            reqMapper.updateById(req);

            //将新增报修单时维修记录的维修工单id更新
            LambdaQueryWrapper<EimsRepairRecord> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.eq(EimsRepairRecord::getReqId, add.getReqId());
            EimsRepairRecord one = recordMapper.selectOne(queryWrapper);
            if(one!=null){
                one.setResId(add.getId());
                recordMapper.updateById(one);
            }


            //生成维修记录
            EimsRepairRecord record = new EimsRepairRecord();
            record.setReqId(add.getReqId());
            record.setResId(add.getId());
            record.setHandleTime(new Date());
            //接单状态
            record.setOpera(DictConstants.REPAIR_RECORD_HANDLE_DETAIL.JIEDAN);
            record.setOperaUser(add.getCreateBy());
            record.setOperaResult("接单，生成维修工单");
            //新增时生成记录
            recordMapper.insert(record);


        }
        return flag;
    }

    @SneakyThrows
    @Transactional(rollbackFor = Exception.class)
    @Override
    public Boolean insertBatchByBo(EimsRepairResBo bo){
        String batchReqIds = bo.getBatchReqIds();
        boolean result = StringUtils.isNotEmpty(batchReqIds);
        for (String reqId : batchReqIds.split(",")) {
            EimsRepairReqVo reqVo = reqMapper.selectVoById(reqId);
            EimsRepairResBo insert = new EimsRepairResBo();
            insert.setReqId(reqVo.getId());
            insert.setReqUser(reqVo.getReqUser());
            insert.setReqDept(reqVo.getReqDept());
            insert.setResCode(reqVo.getCode().replace("BXD","WXD"));
            insert.setResUser(bo.getResUser());
            insert.setResDept(bo.getResDept());
            insert.setStatus(DictConstants.REPAIR_RES_STATUS_DETAIL.WEIXIU);
            insert.setStartTime(new Date());
            Boolean b = insertByBo(insert);
            if(!b)throw new Exception("");
        }
        return result;
    }

    /**
@@ -145,6 +189,18 @@
            reqVo.setStatus(DictConstants.REPAIR_REQ_STATUS_DETAIL.WANCHENG);
            EimsRepairReq req = MapstructUtils.convert(reqVo, EimsRepairReq.class);
            reqMapper.updateById(req);

            //生成维修记录
            EimsRepairRecord record = new EimsRepairRecord();
            record.setResId(bo.getId());
            record.setReqId(bo.getReqId());
            record.setHandleTime(new Date());
            //完成状态
            record.setOpera(DictConstants.REPAIR_RECORD_HANDLE_DETAIL.WANCHENG);
            record.setOperaUser(bo.getUpdateBy());
            record.setOperaResult("完成维修工单");
            recordMapper.insert(record);

        }
        validEntityBeforeSave(update);
        return baseMapper.updateById(update) > 0;
@@ -174,6 +230,7 @@

    @Override
    public TableDataInfo<EimsRepairResVo> queryPageListCustom(EimsRepairResBo bo, PageQuery pageQuery) {
        DataFilterUtil.getInstance().filterRepairRes(bo);
        Page<EimsRepairResVo> page = baseMapper.selectRepairResList(pageQuery.build(), buildWrapper(bo));
        return TableDataInfo.build(page);
    }
@@ -184,9 +241,14 @@
        qw.like(StringUtils.isNotBlank(bo.getResCode()), "res.res_code", bo.getResCode());
        qw.like(StringUtils.isNotBlank(bo.getReqCode()), "req.code", bo.getReqCode());
        qw.eq(bo.getResUser() != null, "res.res_user", bo.getResUser());
        qw.eq(bo.getReqUser() != null, "res.req_user", bo.getReqUser());

        List<Long> allDescendantIds = getAllDescendantIds(bo.getResDept());
        qw.in(bo.getResDept() != null, "res.res_dept", allDescendantIds);
        List<Long> resDeptIds = getAllDescendantIds(bo.getResDept());
        qw.in(bo.getResDept() != null, "res.res_dept", resDeptIds);

        List<Long> reqDeptIds = getAllDescendantIds(bo.getReqDept());
        qw.in(bo.getReqDept() != null, "res.req_dept", reqDeptIds);


        qw.eq(StringUtils.isNotBlank(bo.getStatus()), "res.status", bo.getStatus());
        qw.orderByDesc("res.create_time");