| | |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.finance.common.basic.PageDTO; |
| | | import com.finance.common.core.domain.R; |
| | | import com.finance.common.enums.ReportingStatusEnum; |
| | | import com.finance.common.utils.SecurityUtils; |
| | | import com.finance.system.domain.TbBasicData; |
| | | import com.finance.system.query.HistoryDataQuery; |
| | |
| | | String areaCode = SecurityUtils.getLoginUser().getUser().getAreaCode(); |
| | | Page<TbBasicData> page = tbBasicDataService.lambdaQuery() |
| | | .eq(TbBasicData::getDeptAreaCode, areaCode) |
| | | .eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED) |
| | | // .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())); |