From bb82c543675698d16eb80ae2bc6b82593fae8491 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 21 八月 2023 11:11:17 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
server/src/main/java/doumeemes/api/ext/StatisticsController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/StatisticsController.java b/server/src/main/java/doumeemes/api/ext/StatisticsController.java
index 4a9c7a8..3c404e0 100644
--- a/server/src/main/java/doumeemes/api/ext/StatisticsController.java
+++ b/server/src/main/java/doumeemes/api/ext/StatisticsController.java
@@ -25,7 +25,7 @@
* @date 2022/04/20 10:56
*/
@RestController
-@RequestMapping("/ext/statistic")
+@RequestMapping("/statistics")
@Api(tags = "澶у睆鏁版嵁鐪嬫澘-缁熻鏁版嵁鎺ュ彛")
public class StatisticsController extends BaseController {
@@ -42,7 +42,6 @@
public ApiResponse<StatisticsPlanDataModel> getProcedurePlanData(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam Integer procedureId) {
return ApiResponse.success(statisticsService.getProcedurePlanData(companyId,departId,procedureId));
}
-
@ApiOperation("鍛樺伐浜у搧缁熻TOP10")
@GetMapping("/userProduceTop/{companyId}/{departId}")
public ApiResponse<List<UserProduceTopModel>> getUserProducceTop(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam Integer procedureId) {
@@ -64,14 +63,12 @@
, @RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap) {
return ApiResponse.success(statisticsService.getRecordLogPage(companyId,departId,pageWrap));
}
-
@ApiOperation("宸℃璁板綍鍒嗛〉鏌ヨ")
@PostMapping("/getDeviceCheckPage/{companyId}/{departId}")
public ApiResponse<PageData<DeviceCheckExtListVO>> getDeviceCheckPage (@PathVariable Integer companyId, @PathVariable Integer departId
,@RequestBody PageWrap<QueryDeviceCheckExtDTO> pageWrap) {
return ApiResponse.success(statisticsService.getDeviceCheckPage(companyId,departId,pageWrap));
}
-
@ApiOperation("宸ュ簭璁″垝杩涘害鏌ヨ")
@GetMapping("/getProcedurePlansList/{companyId}/{departId}")
public ApiResponse<List<ProcedurePlansPageModel>> getProcedurePlansList (@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam Integer procedureId) {
@@ -87,6 +84,10 @@
public ApiResponse<List<ProcedureProcessModel>> getProcedureProcessList (@PathVariable Integer companyId, @PathVariable Integer departId ) {
return ApiResponse.success(statisticsService.getProcedureProcessList(companyId,departId));
}
-
+ @ApiOperation("鎴愬搧璁″垝-瀹炴椂浠撳簱浣欓噺缁熻")
+ @GetMapping("/getStockList/{companyId}/{departId}")
+ public ApiResponse<List<StockDataModel>> getStockList (@PathVariable Integer companyId, @PathVariable Integer departId ) {
+ return ApiResponse.success(statisticsService.getStockList(companyId,departId));
+ }
}
--
Gitblit v1.9.3