From 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
index c18ad2f..305e561 100644
--- a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
@@ -14,7 +14,9 @@
import doumeemes.dao.business.model.WorkorderRecord;
import doumeemes.dao.ext.bean.EndCheckApBean;
import doumeemes.dao.ext.beanDto.QueryWStockDto;
+import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO;
import doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO;
+import doumeemes.dao.ext.vo.SalaryStatisticsListVO;
import doumeemes.dao.ext.vo.WStockExtListForWorkorderVO;
import doumeemes.dao.ext.vo.WStockExtListVO;
import doumeemes.dao.ext.vo.WorkorderRecordExtListVO;
@@ -140,6 +142,12 @@
public ApiResponse<PageData<WorkorderRecordExtListVO>> findPage (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap) {
return ApiResponse.success(workorderRecordExtService.findPage(pageWrap));
}
+ @ApiOperation("宸ヨ祫鎶ヨ〃缁熻鍒嗛〉鏌ヨ")
+ @PostMapping("/salaryStatistic")
+ @RequiresPermissions("ext:workorderrecordext:query")
+ public ApiResponse<PageData<SalaryStatisticsListVO>> salaryStatistic (@RequestBody PageWrap<QuerySalaryStatisticDTO> pageWrap) {
+ return ApiResponse.success(workorderRecordExtService.salaryStatistic(pageWrap));
+ }
@ApiOperation("鏌ヨ鍏ㄩ儴")
@PostMapping("/all")
--
Gitblit v1.9.3