Merge remote-tracking branch 'origin/master'

zhangherong

15 小时以前 35f7901210de45eefaa58b38db23405c561f9484

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java

@@ -11,6 +11,7 @@
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
@@ -142,18 +143,18 @@
        StringBuilder sb = new StringBuilder();
        detailList.forEach(detail -> {
            sb.append(detail.getItemCode()).append("、");
            sb.append(detail.getExceptionDescription()).append(";");
            sb.append(detail.getExceptionDescription()).append("; ");
        });
        EamEquipmentFaultReason reason = eamEquipmentFaultReasonService.selectByFaultCode(BusinessCodeConst.EFR20250009);
        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);
        entity.setFaultDescription(sb.toString());
        if(reason == null){
            entity.setFaultName("周保执行报修处理");
            entity.setFaultDescription(sb.toString());
        }else {
            entity.setFaultName(reason.getFaultName());
            entity.setFaultType(reason.getFaultCategory());
@@ -162,6 +163,8 @@
        this.baseMapper.insert(entity);
        //更新设备维修状态
        eamEquipmentExtendService.updateEquipmentRepairStatus(entity.getEquipmentId(), EquipmentRepairStatus.WAIT_REPAIR.name());
        //推送企业微信消息
        sendQywxTemplateCardMessage(entity);
        return entity;
    }

@@ -172,18 +175,18 @@
        StringBuilder sb = new StringBuilder();
        detailList.forEach(detail -> {
            sb.append(detail.getItemCode()).append("、");
            sb.append(detail.getExceptionDescription()).append(";");
            sb.append(detail.getExceptionDescription()).append("; ");
        });
        EamEquipmentFaultReason reason = eamEquipmentFaultReasonService.selectByFaultCode(BusinessCodeConst.EFR20250010);
        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);
        entity.setFaultDescription(sb.toString());
        if(reason == null){
            entity.setFaultName("点检执行报修处理");
            entity.setFaultDescription(sb.toString());
        }else {
            entity.setFaultName(reason.getFaultName());
            entity.setFaultType(reason.getFaultCategory());
@@ -192,6 +195,8 @@
        this.baseMapper.insert(entity);
        //更新设备维修状态
        eamEquipmentExtendService.updateEquipmentRepairStatus(entity.getEquipmentId(), EquipmentRepairStatus.WAIT_REPAIR.name());
        //推送企业微信消息
        sendQywxTemplateCardMessage(entity);
        return entity;
    }

@@ -199,6 +204,10 @@
    @Transactional(rollbackFor = Exception.class)
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.REPORT_REPAIR, businessTable = "eam_report_repair")
    public EamReportRepair add(EamReportRepair eamReportRepair) {
        EamEquipment equipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，请检查！");
        }
        eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
        eamReportRepair.setDelFlag(CommonConstant.DEL_FLAG_0);
        // 附件处理