feat:1.销售台账导出按照查询条件 2.导出订单和产品明细

liding

2026-06-10 6305d0c86c23e9a583e8ca798645885d167f4dc5

 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.device.mapper.MaintenanceTaskMapper;
@@ -47,8 +48,8 @@
            if (StringUtils.isNotEmpty(maintenanceTask.getTaskName())) {
                queryWrapper.like(MaintenanceTask::getTaskName, maintenanceTask.getTaskName());
            }
            if (StringUtils.isNotEmpty(maintenanceTask.getStatus())) {
                queryWrapper.eq(MaintenanceTask::getStatus, maintenanceTask.getStatus());
            if (maintenanceTask.getIsActive() != null) {
                queryWrapper.eq(MaintenanceTask::getIsActive, maintenanceTask.getIsActive());
            }
        }
        queryWrapper.orderByDesc(MaintenanceTask::getCreateTime);
@@ -90,15 +91,20 @@

    @Override
    public AjaxResult add(MaintenanceTask maintenanceTask) {
        maintenanceTask.setActive(true);
        // 计算首次执行时间
        TimingTask task = new TimingTask();
        task.setFrequencyType(maintenanceTask.getFrequencyType());
        task.setFrequencyDetail(maintenanceTask.getFrequencyDetail());
        LocalDateTime firstExecutionTime = timingTaskService.calculateFirstExecutionTime(task);
        maintenanceTask.setNextExecutionTime(firstExecutionTime);
        if (maintenanceTask == null){
            throw new ServiceException("新增失败,数据不能为空");
        }
        // 只有启用状态才添加
        if (maintenanceTask.getIsActive() != null && maintenanceTask.getIsActive() == 1) {
            // 计算首次执行时间
            TimingTask task = new TimingTask();
            task.setFrequencyType(maintenanceTask.getFrequencyType());
            task.setFrequencyDetail(maintenanceTask.getFrequencyDetail());
            LocalDateTime firstExecutionTime = timingTaskService.calculateFirstExecutionTime(task);
            maintenanceTask.setNextExecutionTime(firstExecutionTime);
        }
        int insert = maintenanceTaskMapper.insert(maintenanceTask);
        if (insert > 0) {
        if (insert > 0 && maintenanceTask.getIsActive() != null && maintenanceTask.getIsActive() == 1) {
            maintenanceTaskScheduler.scheduleMaintenanceTask(maintenanceTask);
        }
        return AjaxResult.success("添加成功");
@@ -110,10 +116,23 @@
        if (maintenanceTask1 == null) {
            return AjaxResult.warn("没有此数据");
        }

        Integer oldIsActive = maintenanceTask1.getIsActive();
        Integer newIsActive = maintenanceTask.getIsActive();

        BeanUtils.copyProperties(maintenanceTask, maintenanceTask1);
        int update = maintenanceTaskMapper.updateById(maintenanceTask1);
        if (update > 0) {
            maintenanceTaskScheduler.rescheduleMaintenanceTask(maintenanceTask1);
            // 根据isActive状态变化来处理任务
            if (oldIsActive != null && oldIsActive == 1 && newIsActive != null && newIsActive == 0) {
                // 从启用变为停用，移除任务
                maintenanceTaskScheduler.unscheduleMaintenanceTask(maintenanceTask.getId());
            } else if ((oldIsActive == null || oldIsActive == 0) && newIsActive != null && newIsActive == 1) {
                // 从停用变为启用，添加
                maintenanceTaskScheduler.scheduleMaintenanceTask(maintenanceTask1);
            } else {
                maintenanceTaskScheduler.rescheduleMaintenanceTask(maintenanceTask1);
            }
        }
        return AjaxResult.success("更新成功");
    }