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/api/CurrentQuarterController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/finance-admin/src/main/java/com/finance/web/controller/api/CurrentQuarterController.java b/finance-admin/src/main/java/com/finance/web/controller/api/CurrentQuarterController.java
index 72c6900..b3bfd46 100644
--- a/finance-admin/src/main/java/com/finance/web/controller/api/CurrentQuarterController.java
+++ b/finance-admin/src/main/java/com/finance/web/controller/api/CurrentQuarterController.java
@@ -5,7 +5,6 @@
import com.finance.common.exception.ServiceException;
import com.finance.common.utils.BeanUtils;
import com.finance.common.utils.DateUtils;
-import com.finance.system.constants.QuarterConstant;
import com.finance.system.domain.TbQuestion;
import com.finance.system.dto.QuestionDTO;
import com.finance.system.dto.update.BasicDataUpdDTO;
@@ -32,6 +31,7 @@
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -58,6 +58,9 @@
private final TbScoreService tbScoreService;
private final ISysUserService sysUserService;
+ @Value("${fdb.quarter}")
+ private String quarter;
+
/**
* 字段统计
*
@@ -69,7 +72,7 @@
@Validated @RequestBody CurrentFieldsQuery dto) {
try {
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
dto.setQuarter(previousQuarter);
return tbBasicDataService.fieldsStatics(dto);
} catch (Exception e) {
@@ -151,7 +154,7 @@
@Validated @RequestBody ScoreCalculateQuery query) {
try {
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
query.setQuarter(previousQuarter);
return R.ok(tbBasicDataService.scoreCalculatePage(query));
} catch (Exception e) {
--
Gitblit v1.7.1