huliguo
2025-05-12 c151ec18d4d302a6359a8ef4144835c254c842bc
大屏加年份条件切换
5个文件已修改
17 ■■■■■ 已修改文件
src/main/java/com/cl/controller/DataController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/cl/mapper/DataMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/cl/service/DataService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/cl/service/impl/DataServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/DataMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/cl/controller/DataController.java
@@ -101,8 +101,9 @@
     */
    @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")Integer year) {
        return Result.success( dataService.screen(county==null?0:county,year));
    }
    /**
     * 补贴总人数
@@ -110,6 +111,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));
    }
src/main/java/com/cl/mapper/DataMapper.java
@@ -13,7 +13,7 @@
@Mapper
public interface DataMapper extends BaseMapper<DataEntity> {
    DataEntity screen(Integer county);
    DataEntity screen( @Param("county") Integer county,@Param("createTime")LocalDateTime createTime);
    IPage<DataVO> pageList(IPage<DataEntity> page, @Param("countyList") List<Integer> countyList, @Param("name") String name);
src/main/java/com/cl/service/DataService.java
@@ -14,7 +14,7 @@
import java.util.List;
public interface DataService  extends IService<DataEntity> {
    ScreenVO screen(Integer county);
    ScreenVO screen(Integer county,Integer year);
    void add( AddDataDTO addDataDTO);
src/main/java/com/cl/service/impl/DataServiceImpl.java
@@ -35,10 +35,10 @@
    }
    @Override
    public ScreenVO screen(Integer county) {
    public ScreenVO screen(Integer county,Integer year) {
        LocalDateTime createTime = LocalDateTime.of(year, 12, 31, 23, 59, 59);
        ScreenVO screenVO = new ScreenVO();
        DataEntity data =dataMapper.screen(county);
        DataEntity data =dataMapper.screen(county,createTime);
        if (null== data) {
            return screenVO;
        }
src/main/resources/mapper/DataMapper.xml
@@ -10,6 +10,7 @@
                ROW_NUMBER() OVER (PARTITION BY county ORDER BY create_time DESC) AS rn
            FROM t_data
            WHERE del_flag = 0
        AND create_time  &lt; #{createTime}
                      <if test="county!=null and county !=0">
                          and  county=#{county}
                      </if>