From a93ad50197f1626a12ba5067639119400542f455 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 11 十月 2025 18:01:52 +0800
Subject: [PATCH] 修改指定季度获取方式
---
finance-system/src/main/java/com/finance/system/service/impl/TbScoreServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/finance-system/src/main/java/com/finance/system/service/impl/TbScoreServiceImpl.java b/finance-system/src/main/java/com/finance/system/service/impl/TbScoreServiceImpl.java
index 44a0ced..d2f3d15 100644
--- a/finance-system/src/main/java/com/finance/system/service/impl/TbScoreServiceImpl.java
+++ b/finance-system/src/main/java/com/finance/system/service/impl/TbScoreServiceImpl.java
@@ -10,7 +10,6 @@
import com.finance.common.utils.BeanUtils;
import com.finance.common.utils.CollUtils;
import com.finance.common.utils.DateUtils;
-import com.finance.system.constants.QuarterConstant;
import com.finance.system.domain.TbBasicDataConfig;
import com.finance.system.domain.TbScore;
import com.finance.system.mapper.TbScoreMapper;
@@ -37,6 +36,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;
/**
@@ -55,6 +55,8 @@
private final TbBasicDataConfigService basicDataConfigService;
private final ISysUserService sysUserService;
+ @Value("${fdb.quarter}")
+ private String quarter;
@Override
public Page<ScoreVO> pageScore(ScoreQuery query, Page<ScoreVO> page) {
@@ -82,7 +84,7 @@
vo.setCalculateType(config.getCalculateType());
Page<ScoreDetailVO> page = new Page<>(query.getPageNum(), query.getPageSize());
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
query.setPreviousQuarter(previousQuarter);
Page<ScoreDetailVO> pageVO = baseMapper.scoreCalculateDetail(query, page);
vo.setTotal(pageVO.getTotal());
@@ -118,7 +120,7 @@
@Override
public ScoreRankVO queryRankAndScoreByAreaCode(String areaCode) throws Exception {
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
List<ScoreRankVO> voList = baseMapper.queryRankAndScoreByAreaCode(areaCode,
previousQuarter);
if (CollUtils.isNotEmpty(voList)) {
@@ -156,7 +158,7 @@
vo.setCalculateType(config.getCalculateType());
Page<ScoreDetailVO> page = new Page<>(query.getPageNum(), query.getPageSize());
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
query.setPreviousQuarter(previousQuarter);
Page<ScoreDetailVO> pageVO = baseMapper.fieldsDetail(query, page, areaCodeList);
vo.setTotal(pageVO.getTotal());
--
Gitblit v1.7.1