修改年份切换字段不为必填

huliguo

2025-05-13 a70919b4f7baab856125f36e5bd41f5ee81be680

 src/main/java/com/cl/controller/DataController.java

@@ -24,6 +24,7 @@

import javax.validation.Valid;
import java.time.LocalDateTime;
import java.time.Year;
import java.util.Date;
import java.util.List;

@@ -101,8 +102,12 @@
     */
    @PostMapping("/screen")
    @ApiOperation("大屏数据")
    public Result<ScreenVO> screen(@RequestParam(value = "county",required = false)Integer county) {
        return Result.success( dataService.screen(county==null?0:county));
    public Result<ScreenVO> screen(@RequestParam(value = "county",required = false)Integer county,
                                   @RequestParam(value = "year",required = false)Integer year) {
        if (year == null){
            year = Year.now().getValue();
        }
        return Result.success( dataService.screen(county==null?0:county,year));
    }
    /**
     * 补贴总人数
@@ -110,6 +115,7 @@
    @GetMapping("/getAssistiveDeviceTotal")
    @ApiOperation("补贴总人数")
    public Result<Integer> getAssistiveDeviceTotal(@RequestParam(value = "county",required = false)Integer county,@RequestParam("year") Integer year) {

        return Result.success( dataService.getAssistiveDeviceTotal(county==null?0:county,year));
    }