From 4b5624af301dfbdcf54b65dc55aadde1b6a8efd5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 24 七月 2024 19:55:24 +0800
Subject: [PATCH] bug修改，查询季度写死“2024年一季度”
---
finance-admin-dept/src/main/java/com/finance/web/controller/api/HistoryDataController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/finance-admin-dept/src/main/java/com/finance/web/controller/api/HistoryDataController.java b/finance-admin-dept/src/main/java/com/finance/web/controller/api/HistoryDataController.java
index cdc6724..3ef2d55 100644
--- a/finance-admin-dept/src/main/java/com/finance/web/controller/api/HistoryDataController.java
+++ b/finance-admin-dept/src/main/java/com/finance/web/controller/api/HistoryDataController.java
@@ -4,7 +4,6 @@
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;
@@ -56,7 +55,7 @@
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()));
--
Gitblit v1.7.1