From 18891c60ab1c06a4acc85d0ec54dee50d1b1a19f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 07 四月 2025 17:20:07 +0800
Subject: [PATCH] bug修改
---
finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 3f9a208..cf1145e 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,6 +29,7 @@
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;
@@ -157,7 +158,7 @@
LocalDate fifteenDaysLimit = quarterStartLocalDate.plusDays(14);
LocalDate now = LocalDate.now();
String previousQuarter = DateUtils.getPreviousQuarter();
- // previousQuarter = "2024年一季度";
+ previousQuarter = QuarterConstant.CURRENT_QUARTER;
DateUtils.getQuarterDate(previousQuarter);
vo.setQuarter(previousQuarter);
vo.setStatus(ReportingStatusEnum.UNFILLED);
@@ -232,7 +233,7 @@
return;
}
String previousQuarter = DateUtils.getPreviousQuarter();
- // previousQuarter = "2024年一季度";
+ previousQuarter = QuarterConstant.CURRENT_QUARTER;
// 查询需要填写的动态字段
List<TbField> fieldList =
tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
@@ -497,7 +498,7 @@
LoginUser loginUser = SecurityUtils.getLoginUser();
String areaCode = loginUser.getUser().getAreaCode();
String previousQuarter = DateUtils.getPreviousQuarter();
- // previousQuarter = "2024年一季度";
+ previousQuarter = QuarterConstant.CURRENT_QUARTER;
EasyExcel.read(
file.getInputStream(),
new BasicDataListener(
--
Gitblit v1.7.1