From 0c851d4d98552250a399533c30e5d6780c3e56b6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 30 八月 2024 11:58:47 +0800
Subject: [PATCH] bug修改
---
finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java | 6 +++---
1 files changed, 3 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..416112d 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
@@ -322,7 +322,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(",");
@@ -338,7 +337,7 @@
.eq(SysUser::getUserType, UserTypeEnum.DEPARTMENT).list();
String[] userNameArr = userList.stream().map(SysUser::getAreaName)
.toArray(String[]::new);
- selectedMap.put(0, userNameArr);
+ // selectedMap.put(0, userNameArr);
// 生成下拉框的行数为部门的数量
rows = userList.size();
}
@@ -380,7 +379,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