From fd7979f9109aea3922d158b13700b1f1e99b9408 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 17 五月 2024 15:19:27 +0800
Subject: [PATCH] 功能调整
---
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
index e97b3e6..6f27469 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
@@ -164,7 +164,6 @@
String name = dataReportingMapper.getUserNameById(map1.get("userId"));
registrantCountDto.setName2(name);
}
- ;
String department = dataReportingMapper.getUserDepartmentById(map1.get("userId"));
registrantCountDto.setDepartment(department);
map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto), registrantCountDto.getStartTime(), registrantCountDto.getEndTime()));
@@ -232,7 +231,8 @@
.eq(DataReporting::getName, dataReporting.getName())
.eq(DataReporting::getAccountConsumption, dataReporting.getAccountConsumption())
.eq(DataReporting::getShowNum, dataReporting.getShowNum())
- .eq(DataReporting::getClick, dataReporting.getClick()));
+ .eq(DataReporting::getClick, dataReporting.getClick())
+ .last("limit 1"));
if (BeanUtil.isNotEmpty(dataReporting1)) {
dataReporting.setId(dataReporting1.getId());
dataReportingMapper.updateById(dataReporting);
@@ -337,6 +337,7 @@
@Override
public String downFansSubmitFile(IPage<FansSubmit> page, FansSubmit fansSubmit) {
+ fansSubmit.setCreateTime(fansSubmit.getCreateTime().plusDays(1));
Map<String, Object> map = fansSubmitService.selectFansSubmitList(page, fansSubmit);
String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
String name = "绮変笣涓婃姤" + time + ".csv";
@@ -344,7 +345,7 @@
CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
writer.write(new String[]{"瀵煎嚭鏃堕棿锛�" + time});
writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + fansSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
+ writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + fansSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
writer.write(new String[]{});
writer.write(new String[]{});
List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
@@ -366,14 +367,15 @@
@Override
public String downFinanceSubmitFile(IPage<FinanceSubmit> page, FinanceSubmit financeSubmit) {
+ financeSubmit.setCreateTime(financeSubmit.getCreateTime().plusDays(1));
Map<String, Object> map = financeSubmitService.selectFinanceSubmitList(page, financeSubmit);
- String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
+ String time = LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
String name = "璐㈠姟涓婃姤" + time + ".csv";
String path = outPath + name;
CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
writer.write(new String[]{"瀵煎嚭鏃堕棿锛�" + time});
writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + financeSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
+ writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + financeSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
writer.write(new String[]{});
writer.write(new String[]{});
List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
--
Gitblit v1.9.3