Merge remote-tracking branch 'origin/hxsj' into hxsj

云

2 天以前 b701cf0331e91900bf8055009a745d4953a6c510

 src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java

@@ -3,6 +3,8 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
@@ -15,6 +17,7 @@

import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

@Api(tags = "设备保养")
@RestController
@@ -61,6 +64,7 @@
    @PostMapping ("maintenance")
    @ApiModelProperty("修改设备保养")
    public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
        deviceMaintenance.setStatus(1);
        return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
    }

@@ -82,4 +86,27 @@
    }


    /**
     * 按年份查询每月报修金额（按设备台账分组）
     * @param year 前端传入的年份（如2025）
     */
    @GetMapping("/monthlyAmount")
    @ApiModelProperty("按年份查询每月报修金额（按设备台账分组）")
    public AjaxResult getMonthlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<DeviceMonthlyRepairTableDTO> result = deviceMaintenanceService.getMonthlyRepairAmountByYear(year);
        return AjaxResult.success(result);
    }

    /**
     * 按年份查询报修金额（按设备台账分组）
     * @param year 前端传入的年份（如2025）
     */
    @GetMapping("/yearlyAmount")
    @ApiModelProperty("按年份查询报修金额（按设备台账分组）")
    public AjaxResult yearlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<RepairAmountGroupDTO> result = deviceMaintenanceService.getRepairAmountByYear(year);
        return AjaxResult.success(result);
    }


}