From a93ad50197f1626a12ba5067639119400542f455 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 11 十月 2025 18:01:52 +0800
Subject: [PATCH] 修改指定季度获取方式
---
finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java b/finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java
index 8f4dfd5..3a14047 100644
--- a/finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java
+++ b/finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java
@@ -15,7 +15,6 @@
import com.finance.common.utils.CollUtils;
import com.finance.common.utils.DateUtils;
import com.finance.common.utils.StringUtils;
-import com.finance.system.constants.QuarterConstant;
import com.finance.system.domain.TbBasicData;
import com.finance.system.domain.TbBasicDataCategory;
import com.finance.system.domain.TbQuestion;
@@ -61,6 +60,7 @@
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
/**
@@ -80,6 +80,8 @@
private final TbScoreService tbScoreService;
private final TbBasicDataConfigService tbBasicDataConfigService;
private final TbBasicDataCategoryService tbBasicDataCategoryService;
+ @Value("${fdb.quarter}")
+ private String quarter;
public ProvinceStaticsVO provinceStatics() {
ProvinceStaticsVO vo = new ProvinceStaticsVO();
@@ -122,7 +124,7 @@
ScoreRankVO scoreRankVO = tbScoreService.queryRankAndScoreByAreaCode("510000");
riskAndTransferVO.setScoreRankVO(scoreRankVO);
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
// 查询转移支付规模总额
List<TbBasicData> list = tbBasicDataService.lambdaQuery()
.select(TbBasicData::getTransferPaymentScale)
@@ -243,7 +245,7 @@
DataScreenConfigVO riskLevel = tbDataScreenConfigService.getRiskLevel();
List<RiskLevelVO> riskLevelVOList = formatRiskLevel(riskLevel);
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
List<RiskRankingVO> voList = tbScoreService.queryRiskRanking(
previousQuarter);
int rank = 1;
@@ -269,7 +271,7 @@
public List<QuestionVO> queryQuestions() throws Exception {
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
List<TbQuestion> list = tbQuestionService.lambdaQuery()
.eq(TbQuestion::getQuarter, previousQuarter).list();
return BeanUtils.copyList(list, QuestionVO.class);
@@ -285,7 +287,7 @@
dataAnalysisVO.setRank(scoreRankVO.getRank());
dataAnalysisVO.setScore(scoreRankVO.getScore());
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
// 查询问题
List<TbQuestion> list = tbQuestionService.lambdaQuery()
.eq(TbQuestion::getQuarter, previousQuarter)
@@ -558,13 +560,13 @@
public List<DeptCalculateDetailVO> deptCalculateDetail(DeptCalculateDetailQuery query)
throws Exception {
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
return tbScoreService.deptCalculateDetail(query, previousQuarter);
}
public CurrentFieldsDetailVO viewRawData(String areaCode) throws Exception {
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
Optional<TbBasicData> basicDataOptional = tbBasicDataService.lambdaQuery()
.eq(TbBasicData::getDeptAreaCode, areaCode)
.eq(TbBasicData::getQuarter, previousQuarter).oneOpt();
--
Gitblit v1.7.1