zhangherong
2025-05-07 b49bb4172817ebce1197710ae727ea9194b392a3
art: 设备管理-报修-点检、周保触发报修接口修改
已修改4个文件
39 ■■■■■ 文件已修改
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFaultReasonServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -38,4 +38,12 @@
    //设备能源部
    String PCR0005 = "PCR0005";
    /**
     * 故障原因编码
     */
    //点检执行故障
    String EFR20250009 = "EFR20250009";
    //周保执行故障
    String EFR20250010 = "EFR20250010";
}
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFaultReasonService.java
@@ -10,5 +10,10 @@
 * @Version: V1.0
 */
public interface IEamEquipmentFaultReasonService extends IService<EamEquipmentFaultReason> {
    /**
     * 查询故障原因
     * @param faultCode 故障编码
     * @return
     */
    EamEquipmentFaultReason selectByFaultCode(String faultCode);
}
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFaultReasonServiceImpl.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.modules.eam.entity.EamEquipmentFaultReason;
import org.jeecg.modules.eam.mapper.EamEquipmentFaultReasonMapper;
import org.jeecg.modules.eam.service.IEamEquipmentFaultReasonService;
@@ -16,4 +17,10 @@
@Service
public class EamEquipmentFaultReasonServiceImpl extends ServiceImpl<EamEquipmentFaultReasonMapper, EamEquipmentFaultReason> implements IEamEquipmentFaultReasonService {
    @Override
    public EamEquipmentFaultReason selectByFaultCode(String faultCode) {
        LambdaQueryWrapper<EamEquipmentFaultReason> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamEquipmentFaultReason::getFaultCode, faultCode);
        return this.baseMapper.selectOne(queryWrapper);
    }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -17,6 +17,7 @@
import org.jeecg.modules.eam.mapper.EamReportRepairMapper;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentFaultReasonService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecg.modules.eam.vo.EquipmentRepairStatistics;
import org.jeecg.modules.system.service.IMdcProductionService;
@@ -41,6 +42,8 @@
    private IEamEquipmentExtendService eamEquipmentExtendService;
    @Autowired
    private IMdcProductionService mdcProductionService;
    @Autowired
    private IEamEquipmentFaultReasonService eamEquipmentFaultReasonService;
    /**
     * 分页列表
@@ -73,15 +76,20 @@
            sb.append(detail.getItemCode()).append("、");
            sb.append(detail.getExceptionDescription()).append(";");
        });
        EamEquipmentFaultReason reason = eamEquipmentFaultReasonService.selectByFaultCode(BusinessCodeConst.EFR20250009);
        EamReportRepair entity = new EamReportRepair();
        entity.setEquipmentId(equipmentId);
        entity.setCreateBy(reportUser);
        entity.setFaultStartTime(new Date());
        entity.setBreakdownFlag(CommonConstant.DEFAULT_0);
        entity.setDelFlag(CommonConstant.DEL_FLAG_0);
        if(reason == null){
        entity.setFaultName("周保执行报修处理");
        entity.setFaultDescription(sb.toString());
        entity.setFaultType(CommonConstant.DEFAULT_1);
        }else {
            entity.setFaultName(reason.getFaultName());
            entity.setFaultType(reason.getFaultCategory());
        }
        entity.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
        this.baseMapper.insert(entity);
        //更新设备维修状态
@@ -98,15 +106,20 @@
            sb.append(detail.getItemCode()).append("、");
            sb.append(detail.getExceptionDescription()).append(";");
        });
        EamEquipmentFaultReason reason = eamEquipmentFaultReasonService.selectByFaultCode(BusinessCodeConst.EFR20250010);
        EamReportRepair entity = new EamReportRepair();
        entity.setEquipmentId(equipmentId);
        entity.setCreateBy(reportUser);
        entity.setFaultStartTime(new Date());
        entity.setBreakdownFlag(CommonConstant.DEFAULT_0);
        entity.setDelFlag(CommonConstant.DEL_FLAG_0);
        if(reason == null){
        entity.setFaultName("点检执行报修处理");
        entity.setFaultDescription(sb.toString());
        entity.setFaultType(CommonConstant.DEFAULT_1);
        }else {
            entity.setFaultName(reason.getFaultName());
            entity.setFaultType(reason.getFaultCategory());
        }
        entity.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
        this.baseMapper.insert(entity);
        //更新设备维修状态