From f55271878d0599d7246b8c19a6501da13342d446 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 08 四月 2024 08:21:16 +0800
Subject: [PATCH] 调整
---
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
index c21f0fd..edb24e5 100644
--- a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
+++ b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
@@ -6,6 +6,8 @@
import cn.hutool.core.text.csv.CsvReader;
import cn.hutool.core.text.csv.CsvRow;
import cn.hutool.core.text.csv.CsvUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
@@ -88,6 +90,9 @@
public Result selectFansSubmitList(@RequestBody Map<String, Object> data) {
Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
FansSubmit fansSubmit = JSON.parseObject(JSON.toJSONString(data.get("entity")), FansSubmit.class);
+ if (ObjectUtil.isNotEmpty(fansSubmit.getCreateTime())){
+ fansSubmit.setCreateTime(fansSubmit.getCreateTime().plusDays(1));
+ }
return Result.success(fansSubmitService.selectFansSubmitList(page, fansSubmit));
}
@@ -114,6 +119,9 @@
public Result selectFinanceSubmitList(@RequestBody Map<String, Object> data) {
Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
FinanceSubmit financeSubmit = JSON.parseObject(JSON.toJSONString(data.get("entity")), FinanceSubmit.class);
+ if (ObjectUtil.isNotEmpty(financeSubmit.getCreateTime())){
+ financeSubmit.setCreateTime(financeSubmit.getCreateTime().plusDays(1));
+ }
return Result.success(financeSubmitService.selectFinanceSubmitList(page, financeSubmit));
}
@@ -203,9 +211,8 @@
break;
}
}
- list.add(reporting);
+ if(reporting.getAccountConsumption().compareTo(BigDecimal.ZERO) > 0) list.add(reporting);
}
- deleteAllData(format);
dataReportingService.addDataReporting(list, format, param);
return Result.success();
}
@@ -382,6 +389,13 @@
return Result.success(dataReportingService.selectDataReportingForCreateUserNames(time));
}
+ @ApiOperation(value = "鑾峰彇椤圭洰鏁版嵁缁熻鐨勯」鐩瓫閫夐」")
+ @PostMapping("/selectDataReportingForProduct")
+ @ValueAuth
+ public Result selectDataReportingForProduct(String time) {
+ return Result.success(dataReportingService.selectDataReportingForProduct(time));
+ }
+
@ApiOperation(value = "鑾峰彇寰俊鍙峰垪琛�")
@GetMapping("/selectVxs")
@ValueAuth
--
Gitblit v1.9.3