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/BasicDataListener.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/finance-system/src/main/java/com/finance/system/listener/BasicDataListener.java b/finance-system/src/main/java/com/finance/system/listener/BasicDataListener.java
index 660f01f..36260fa 100644
--- a/finance-system/src/main/java/com/finance/system/listener/BasicDataListener.java
+++ b/finance-system/src/main/java/com/finance/system/listener/BasicDataListener.java
@@ -33,6 +33,7 @@
import com.google.common.collect.Lists;
import java.time.LocalDate;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -187,15 +188,19 @@
.eq(TbBasicData::getDeptAreaCode, areaCode).oneOpt();
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.setReportingTime(DateUtils.getQuarterDate(quarter));
+ tbBasicData.setStatus(ReportingStatusEnum.MISSING_DATA);
long count = dataMap.entrySet().stream()
.filter(entry -> StringUtils.isBlank(entry.getValue())).count();
- tbBasicData.setStatus(
- count > 0 ? ReportingStatusEnum.MISSING_DATA : ReportingStatusEnum.FILLED);
+ if (count > 0) {
+ tbBasicData.setStatus(ReportingStatusEnum.FILLED);
+ tbBasicData.setFinishedTime(new Date());
+ }
+
tbBasicDataService.saveOrUpdate(tbBasicData);
tbBasicDataFieldService.remove(Wrappers.<TbBasicDataField>lambdaQuery()
.eq(TbBasicDataField::getBasicDataId, tbBasicData.getId()));
@@ -231,7 +236,7 @@
tbBasicDataField.setBasicDataId(tbBasicData.getId());
tbBasicDataField.setFieldId(field.getId());
tbBasicDataField.setFieldName(field.getFieldName());
- tbBasicDataField.setFieldValue(value);
+ tbBasicDataField.setFieldValue(value.replace(",", ""));
fields.add(tbBasicDataField);
}
}
--
Gitblit v1.7.1