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/TbBasicDataServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java b/finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java
index cf1145e..5005d80 100644
--- a/finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java
+++ b/finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java
@@ -29,7 +29,6 @@
import com.finance.common.utils.EasyExcelUtil;
import com.finance.common.utils.SecurityUtils;
import com.finance.common.utils.StringUtils;
-import com.finance.system.constants.QuarterConstant;
import com.finance.system.domain.TbBasicData;
import com.finance.system.domain.TbBasicDataConfig;
import com.finance.system.domain.TbBasicDataConfigDetail;
@@ -93,6 +92,7 @@
import javax.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -121,6 +121,8 @@
private final TbDataScreenConfigService tbDataScreenConfigService;
private final AsyncService asyncService;
private final TbBasicDataCategoryService tbBasicDataCategoryService;
+ @Value("${fdb.quarter}")
+ private String quarter;
public static void setFieldValues(
List<FieldsTreeVO> fields, Map<Long, TbBasicDataField> fieldMap) {
@@ -158,7 +160,7 @@
LocalDate fifteenDaysLimit = quarterStartLocalDate.plusDays(14);
LocalDate now = LocalDate.now();
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
DateUtils.getQuarterDate(previousQuarter);
vo.setQuarter(previousQuarter);
vo.setStatus(ReportingStatusEnum.UNFILLED);
@@ -233,7 +235,7 @@
return;
}
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
// 查询需要填写的动态字段
List<TbField> fieldList =
tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
@@ -498,7 +500,7 @@
LoginUser loginUser = SecurityUtils.getLoginUser();
String areaCode = loginUser.getUser().getAreaCode();
String previousQuarter = DateUtils.getPreviousQuarter();
- previousQuarter = QuarterConstant.CURRENT_QUARTER;
+ previousQuarter = quarter;
EasyExcel.read(
file.getInputStream(),
new BasicDataListener(
--
Gitblit v1.7.1