吴羡
12 小时以前 2f07589b54d56085af77b50d580890cd4130b444
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceCalibrationPlanController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.device.dto.DeviceCalibrationPlanDetailDto;
import com.ruoyi.device.dto.DeviceCalibrationPlanDto;
import com.ruoyi.device.pojo.DeviceCalibrationPlan;
import com.ruoyi.device.pojo.DeviceCalibrationPlanDetail;
@@ -118,12 +119,22 @@
    }
    /**
     * 按年份查询设备校准计划(不存在则自动创建),并自动补全已到点的设备明细
     * @return
     */
    @Operation(summary = "按年份查询设备校准计划(自动创建并补全到点明细)")
    @GetMapping("/getPlanByYear")
    public Result<DeviceCalibrationPlanDto> getPlanByYear(String planYear) {
        return Result.success(deviceCalibrationPlanService.getOrCreatePlanByYear(planYear));
    }
    /**
     * 设备校准计划详情列表
     * @return
     */
    @Operation(summary = "设备校准计划详情列表")
    @GetMapping("/pageDeviceCalibrationPlanDetail")
    public Result<IPage<DeviceCalibrationPlanDetail>> pageDeviceCalibrationPlanDetail(Page page, DeviceCalibrationPlanDetail deviceCalibrationPlanDetails) {
    public Result<IPage<DeviceCalibrationPlanDetailDto>> pageDeviceCalibrationPlanDetail(Page page, DeviceCalibrationPlanDetail deviceCalibrationPlanDetails) {
        return Result.success(deviceCalibrationPlanService.pageDeviceCalibrationPlanDetail(page, deviceCalibrationPlanDetails));
    }