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/listener/HistoryDataListener.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/finance-system/src/main/java/com/finance/system/listener/HistoryDataListener.java b/finance-system/src/main/java/com/finance/system/listener/HistoryDataListener.java
index 6fb5348..5aba6f8 100644
--- a/finance-system/src/main/java/com/finance/system/listener/HistoryDataListener.java
+++ b/finance-system/src/main/java/com/finance/system/listener/HistoryDataListener.java
@@ -165,6 +165,9 @@
List<TbBasicData> basicDataList = tbBasicDataService.lambdaQuery().
eq(TbBasicData::getQuarter, quarter).list();
for (Map<Integer, String> dataMap : dataMapList) {
+ // 查询需要填写的动态字段
+ fieldList =
+ tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
Optional<SysUser> sysUser = departmentList.stream()
.filter(dept -> dept.getAreaName().equals(dataMap.get(0))).findFirst();
if (!sysUser.isPresent()) {
@@ -177,8 +180,8 @@
.filter(basicData -> basicData.getDeptAreaCode().equals(areaCode)).findFirst();
tbBasicData = tbBasicDataOpt.orElseGet(TbBasicData::new);
tbBasicData.setQuarter(quarter);
- tbBasicData.setTransferPaymentScale(dataMap.get(2));
- tbBasicData.setCurrentGdp(dataMap.get(3));
+ tbBasicData.setTransferPaymentScale(dataMap.get(2).replace(",", ""));
+ tbBasicData.setCurrentGdp(dataMap.get(3).replace(",", ""));
tbBasicData.setDeptAreaCode(areaCode);
tbBasicData.setRemark(dataMap.get(remarkIndex));
tbBasicData.setStatus(ReportingStatusEnum.MISSING_DATA);
@@ -238,7 +241,8 @@
tbBasicDataField.setBasicDataId(tbBasicData.getId());
tbBasicDataField.setFieldId(field.getId());
tbBasicDataField.setFieldName(field.getFieldName());
- tbBasicDataField.setFieldValue(value);
+ tbBasicDataField.setFieldValue(
+ Objects.isNull(value) ? "" : value.replace(",", ""));
fields.add(tbBasicDataField);
}
}
--
Gitblit v1.7.1