From 4b5624af301dfbdcf54b65dc55aadde1b6a8efd5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 24 七月 2024 19:55:24 +0800
Subject: [PATCH] bug修改，查询季度写死“2024年一季度”
---
finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java b/finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java
index 2019f26..7e95dea 100644
--- a/finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java
+++ b/finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java
@@ -13,7 +13,6 @@
import com.finance.common.exception.ServiceException;
import com.finance.common.utils.BeanUtils;
import com.finance.common.utils.CollUtils;
-import com.finance.common.utils.DateUtils;
import com.finance.common.utils.EasyExcelUtil;
import com.finance.common.utils.SecurityUtils;
import com.finance.common.utils.StringUtils;
@@ -322,7 +321,6 @@
.collect(Collectors.toList());
Map<Integer, String[]> selectedMap = new HashMap<>();
if (CollUtils.isNotEmpty(collect)) {
- selectedMap = new HashMap<>();
for (TbField tbField : collect) {
int outerListIndex = getOuterListIndex(head, tbField.getFieldName());
String[] selectStr = tbField.getTextContent().split(",");
@@ -380,7 +378,8 @@
columnNo.add(String.valueOf(i));
}
excellist.add(columnNo);
- excellist.add(Lists.newArrayList(areaName, isDept ? DateUtils.getNowQuarter() : ""));
+ excellist.add(Lists.newArrayList(areaName, isDept ? "2024年一季度" : ""));
+ // excellist.add(Lists.newArrayList(areaName, isDept ? DateUtils.getPreviousQuarter() : ""));
return excellist;
}
--
Gitblit v1.7.1