From 437f8e2b89a18363a1073fdbb3ab99bcd840a757 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 21 四月 2025 10:51:36 +0800
Subject: [PATCH] 危化品新版修改
---
hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java b/hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java
index 57bd491..d47350f 100644
--- a/hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java
+++ b/hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/web/HzStatisticController.java
@@ -33,27 +33,39 @@
private HzStatisticService statisticService;
@ApiOperation(value = "30天入库数量统计")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query",name = "companyId",dataType ="long",required = false,value = "公司id")
+ })
@GetMapping("/entryStatistic")
- public CommonResult entryStatistic() {
- return CommonResult.success(statisticService.entryStatic());
+ public CommonResult entryStatistic(Long companyId) {
+ return CommonResult.success(statisticService.entryStatic(companyId));
}
@ApiOperation(value = "一周使用数量统计")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query",name = "companyId",dataType ="long",required = false,value = "公司id")
+ })
@GetMapping("/useStatistic")
- public CommonResult useStatistic() {
- return CommonResult.success(statisticService.useEverydayStatic());
+ public CommonResult useStatistic(Long companyId) {
+ return CommonResult.success(statisticService.useEverydayStatic(companyId));
}
@ApiOperation(value = "一周使用频繁的危化品数量统计")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query",name = "companyId",dataType ="long",required = false,value = "公司id")
+ })
@GetMapping("/maxUseStatistic")
- public CommonResult maxUseStatistic() {
- return CommonResult.success(statisticService.maxUseStatic());
+ public CommonResult maxUseStatistic(Long companyId) {
+ return CommonResult.success(statisticService.maxUseStatic(companyId));
}
@ApiOperation(value = "首页数据统计")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query",name = "companyId",dataType ="long",required = false,value = "公司id")
+ })
@GetMapping("/homeDataStatistic")
- public CommonResult homeDataStatistic() {
- return CommonResult.success(statisticService.homeDataStatistic());
+ public CommonResult homeDataStatistic(Long companyId) {
+ return CommonResult.success(statisticService.homeDataStatistic(companyId));
}
@@ -63,11 +75,12 @@
@ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
@ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"),
@ApiImplicitParam(paramType = "query", name = "startTime", dataType = "string", required = false, value = "开始时间,格式xxxx-xx-xx 00:00:00"),
- @ApiImplicitParam(paramType = "query", name = "endTime", dataType = "string", required = false, value = "结束时间,格式xxxx-xx-xx 23:59:59")
+ @ApiImplicitParam(paramType = "query", name = "endTime", dataType = "string", required = false, value = "结束时间,格式xxxx-xx-xx 23:59:59"),
+ @ApiImplicitParam(paramType = "query", name = "companyId", dataType = "long", required = false, value = "企业id")
})
@GetMapping("/hazmatUseStatistic")
- public CommonResult hazmatUseStatistic(String startTime,String endTime) {
- return CommonResult.success(statisticService.useStatic(startTime,endTime));
+ public CommonResult hazmatUseStatistic(String startTime,String endTime,Long companyId) {
+ return CommonResult.success(statisticService.useStatic(startTime,endTime,companyId));
}
@ApiOperation(value = "危化品使用记录导出")
--
Gitblit v1.9.2