From c115237aeb36c61bb61b617d54ba4d7025381527 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 08 四月 2024 11:11:57 +0800
Subject: [PATCH] 系统调整
---
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 e6f7da5..e916fa2 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
@@ -77,7 +77,7 @@
return Result.success(dataReportingService.selectProductCountDtoPageList(page, productCountDto));
}
- @ApiOperation(value = "鑾峰彇鐧昏浜烘眹鎬诲垪琛�")
+ @ApiOperation(value = "鑾峰彇鍛樺伐鏁版嵁缁熻鍒楄〃")
@PostMapping("/selectRegistrantCountDtoPageList")
public Result selectRegistrantCountDtoPageList(@RequestBody Map<String, Object> data) {
Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
@@ -211,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();
}
@@ -390,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
@@ -417,4 +423,11 @@
financeSubmitService.deleteAllFinance(date);
return Result.success();
}
+
+ @ApiOperation(value = "鏁版嵁涓婃姤涓荤鏉冮檺")
+ @GetMapping("/dataReportingPower")
+ public Result dataReportingPower() {
+ return Result.success();
+ }
+
}
--
Gitblit v1.9.3