fix: 主生产计划、设备巡检、设备保养数据倒序

gongchunyi

4 天以前 a97c858191738243d52a7bc5520592e274f9a579

fix: 主生产计划、设备巡检、设备保养数据倒序

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

@@ -1,5 +1,6 @@
package com.ruoyi.device.service.impl;

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.utils.bean.BeanUtils;
@@ -34,7 +35,9 @@

    @Override
    public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
        Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, null);
       LambdaQueryWrapper<MaintenanceTask> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.orderByDesc(MaintenanceTask::getId);
        Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, queryWrapper);
        // 2. 如果没有数据，直接返回空分页
        if (taskPage.getRecords().isEmpty()) {
            return AjaxResult.success(taskPage);

 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java

@@ -53,6 +53,8 @@
        if (timingTask.getIsEnabled() != null) {
            queryWrapper.eq(TimingTask::getIsEnabled, timingTask.getIsEnabled());
        }
        // 按 ID 倒序排序
        queryWrapper.orderByDesc(TimingTask::getId);
        IPage<TimingTask> taskPage = timingTaskMapper.selectPage(page, queryWrapper);

        // 2. 如果没有数据，直接返回空分页

 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -7,25 +7,25 @@

    <select id="queryPage" resultType="com.ruoyi.device.vo.DeviceRepairVo">
        select dr.id,
               dr.device_ledger_id,
                dr.repair_time,
                dr.repair_name,
                dr.remark,
                 dr.maintenance_name,
                 dr.maintenance_time,
                 dr.maintenance_result,
                 dr.acceptance_name,
                 dr.acceptance_time,
                 dr.acceptance_remark,
                 dr.status,
                dr.create_time,
                dr.update_time,
                dr.create_user,
                dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model,
               dr.machinery_category
        dr.device_ledger_id,
        dr.repair_time,
        dr.repair_name,
        dr.remark,
        dr.maintenance_name,
        dr.maintenance_time,
        dr.maintenance_result,
        dr.acceptance_name,
        dr.acceptance_time,
        dr.acceptance_remark,
        dr.status,
        dr.create_time,
        dr.update_time,
        dr.create_user,
        dr.update_user,
        dr.tenant_id,
        dl.device_name,
        dl.device_model,
        dr.machinery_category
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        <where>
@@ -53,7 +53,9 @@
                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
            </if>
        </where>
        order by dr.id asc
    </select>

    <select id="detailById" resultType="com.ruoyi.device.vo.DeviceRepairVo">
        select dr.id,
               dr.device_ledger_id,

 src/main/resources/mapper/production/ProductionPlanMapper.xml

@@ -58,7 +58,7 @@
                </if>
            </if>
        </where>
        ORDER BY pp.mps_no DESC
        ORDER BY pp.required_date DESC
    </select>

    <select id="selectWithMaterialByIds" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">