二保三保设备保养时间调整

hyingbo

18 小时以前 23396e93588f52941f729fc63cea84a70847d3bc

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderGenerateJob.java

@@ -1,13 +1,13 @@
package org.jeecg.modules.eam.job;

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.request.EamSecondMaintenanceRequest;
import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.mdc.util.ThrowableUtil;
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Component
@@ -47,6 +48,8 @@
    private ISysQuartzLogService sysQuartzLogService;
    @Autowired
    private IQuartzJobService quartzJobService;
    @Autowired
    private IEamEquipmentExtendService equipmentExtendService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -68,6 +71,14 @@
            log.warn("没有配置任何三保标准，任务结束");
            return;
        }

        List<String> equipmentIdList = standardList.stream().map(EamMaintenanceStandard::getEquipmentId).collect(Collectors.toList());
        List<EamEquipmentExtend> eamEquipmentExtendList = equipmentExtendService.list(new LambdaQueryWrapper<EamEquipmentExtend>()
                .in(EamEquipmentExtend::getId, equipmentIdList));
        Map<String, EamEquipmentExtend> eamEquipmentExtendByIdMap = eamEquipmentExtendList.stream()
                .collect(Collectors.toMap(EamEquipmentExtend::getId,
                        eamEquipmentExtend -> eamEquipmentExtend,
                        (v1, v2) -> v1));
        //当前日期
        LocalDate now = LocalDate.now();
        try {
@@ -139,6 +150,14 @@

                standard.setLastGenerateTime(new Date());
                eamMaintenanceStandardService.updateById(standard);

                LocalDate nextSecondMaintenanceDate = DateUtils.dateToLocalDate(standard.getInitialDate()).plusDays(standard.getMaintenancePeriod());

                if (eamEquipmentExtendByIdMap.containsKey(standard.getEquipmentId())) {
                    EamEquipmentExtend eamEquipmentExtend = eamEquipmentExtendByIdMap.get(standard.getEquipmentId());
                    eamEquipmentExtend.setNextThirdMaintenance(DateUtils.localDateToDate(nextSecondMaintenanceDate));
                    equipmentExtendService.updateById(eamEquipmentExtend);
                }
            }
            quartzLog.setIsSuccess(0);
        } catch (Exception e) {