财政数据大屏
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
mitao
2024-04-19 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 
 ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java


@@ -18,10 +18,16 @@


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiOperation;


import java.util.Objects;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.RestController;




/**


 * @author mitao


@@ -48,14 +54,18 @@


    @ApiOperation("历史数据分页查询")


    public R<PageDTO<BasicDataVO>> list(@Validated @RequestBody HistoryDataQuery dto) {


        String areaCode = SecurityUtils.getLoginUser().getUser().getAreaCode();


        Page<TbBasicData> page = tbBasicDataService.lambdaQuery().eq(TbBasicData::getDeptAreaCode, areaCode)


        Page<TbBasicData> page = tbBasicDataService.lambdaQuery()


                .eq(TbBasicData::getDeptAreaCode, areaCode)


                .eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED)


                .between(Objects.nonNull(dto.getStartTime()) && Objects.nonNull(dto.getEndTime()),


                        TbBasicData::getReportingTime, dto.getStartTime(), dto.getEndTime())


                .page(new Page<>(dto.getPageNum(), dto.getPageSize()));


        return R.ok(PageDTO.of(page, BasicDataVO.class));


    }




    /**


     * 字段查看


     *


     * @param id 基础数据id


     * @return R<BasicDataFieldVO>


     */


@@ -68,6 +78,7 @@




    /**


     * 得分计算


     *


     * @param query 得分计算条件查询对象


     * @return R<PageDTO < ScoreVO>>


     */