From 349bcef9a96391d22522a3409adf5a89e7e70a95 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 十月 2023 08:46:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev
---
server/src/main/java/doumeemes/api/ext/StatisticsController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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..078144f 100644
--- a/server/src/main/java/doumeemes/api/ext/StatisticsController.java
+++ b/server/src/main/java/doumeemes/api/ext/StatisticsController.java
@@ -6,6 +6,7 @@
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.dto.statistics.*;
import doumeemes.dao.ext.dto.*;
+import doumeemes.dao.ext.vo.DepartmentExtListVO;
import doumeemes.dao.ext.vo.DeviceCheckExtListVO;
import doumeemes.dao.ext.vo.PlansExtListVO;
import doumeemes.service.ext.StatisticsService;
@@ -25,7 +26,7 @@
* @date 2022/04/20 10:56
*/
@RestController
-@RequestMapping("/ext/statistic")
+@RequestMapping("/statistics")
@Api(tags = "澶у睆鏁版嵁鐪嬫澘-缁熻鏁版嵁鎺ュ彛")
public class StatisticsController extends BaseController {
@@ -37,25 +38,25 @@
public ApiResponse<StatisticsPlanDataModel> getPlansData(@PathVariable Integer companyId, @PathVariable Integer departId) {
return ApiResponse.success(statisticsService.getPlansData(companyId,departId));
}
+
@ApiOperation("鏁版嵁缁熻-宸ュ簭璁″垝锛屾墽琛屼腑銆佸欢鏈熻鍒掓暟銆佷粖鏃ョ敓浜т汉鏁般�佷粖鏃ョ敓浜ц澶囨暟銆佷粖鏃ヤ笉鑹搧")
@GetMapping("/getProcedurePlanData/{companyId}/{departId}")
- public ApiResponse<StatisticsPlanDataModel> getProcedurePlanData(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam Integer procedureId) {
+ public ApiResponse<StatisticsPlanDataModel> getProcedurePlanData(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam(required = false) 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) {
+ public ApiResponse<List<UserProduceTopModel>> getUserProducceTop(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam(required = false) Integer procedureId) {
return ApiResponse.success(statisticsService.getUserProduceTopData(companyId,departId,procedureId));
}
@ApiOperation("杩�7澶╀笉鑹搧鍒嗗竷-涓嶈壇鍝佹暟閲忕粺璁�")
@GetMapping("/getUnqualified7DayData/{companyId}/{departId}")
- public ApiResponse<List<Unqualified7DayModel>> getUnqualified7DayData(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam Integer procedureId) {
+ public ApiResponse<List<Unqualified7DayModel>> getUnqualified7DayData(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam(required = false) Integer procedureId) {
return ApiResponse.success(statisticsService.getUnqualified7DayData(companyId,departId,procedureId));
}
@ApiOperation("杩�7澶╀笉鑹搧鍒嗗竷-涓嶈壇鍝佹暟閲�-鎸変笉鑹」缁熻")
@GetMapping("/getUnqualifiedCateData/{companyId}/{departId}")
- public ApiResponse<List<UnqualifiedCateModel>> getUnqualifiedCateData(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam Integer procedureId) {
+ public ApiResponse<List<UnqualifiedCateModel>> getUnqualifiedCateData(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam(required = false) Integer procedureId) {
return ApiResponse.success(statisticsService.getUnqualifiedCateData(companyId,departId,procedureId));
}
@ApiOperation("鎶ュ伐鏃ュ織鍒嗛〉鏌ヨ")
@@ -64,17 +65,15 @@
, @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) {
+ public ApiResponse<List<ProcedurePlansPageModel>> getProcedurePlansList (@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam(required = false) Integer procedureId) {
return ApiResponse.success(statisticsService.getProcedurePlansPage(companyId,departId,procedureId));
}
@ApiOperation("鎴愬搧璁″垝杩涘害鏌ヨ")
@@ -87,6 +86,17 @@
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));
+ }
+
+ @ApiOperation("鏉′欢鏌ヨ浼佷笟鍏ㄩ儴鍏徃閮ㄩ棬")
+ @GetMapping("/getDepartmentList/{companyId}")
+ public ApiResponse<List<DepartmentExtListVO>> getDepartmentList (@PathVariable Integer companyId ) {
+ return ApiResponse.success(statisticsService.getDepartmentList(companyId));
+ }
}
--
Gitblit v1.9.3