From 7fdf35a2364c8482c5056a1c932e1501518f943b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 18:17:48 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
index 305e561..1c7d59d 100644
--- a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
@@ -15,11 +15,9 @@
import doumeemes.dao.ext.bean.EndCheckApBean;
import doumeemes.dao.ext.beanDto.QueryWStockDto;
import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO;
+import doumeemes.dao.ext.dto.QueryUserSalaryListDTO;
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;
+import doumeemes.dao.ext.vo.*;
import doumeemes.service.business.WorkorderRecordService;
import doumeemes.service.ext.WorkorderExtService;
import doumeemes.service.ext.WorkorderRecordExtService;
@@ -142,6 +140,12 @@
public ApiResponse<PageData<WorkorderRecordExtListVO>> findPage (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap) {
return ApiResponse.success(workorderRecordExtService.findPage(pageWrap));
}
+ @ApiOperation("鍛樺伐缁╂晥鍒嗛〉鏌ヨ")
+ @PostMapping("/userSalary")
+ @RequiresPermissions("ext:workorderrecordext:query")
+ public ApiResponse<PageData<UserSalaryListVO>> userSalaryPage (@RequestBody PageWrap<QueryUserSalaryListDTO> pageWrap) {
+ return ApiResponse.success(workorderRecordExtService.userSalaryPage(pageWrap));
+ }
@ApiOperation("宸ヨ祫鎶ヨ〃缁熻鍒嗛〉鏌ヨ")
@PostMapping("/salaryStatistic")
@RequiresPermissions("ext:workorderrecordext:query")
@@ -171,6 +175,16 @@
public void exportExcel (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
workorderRecordExtService.exportExcel(pageWrap,response);
}
+ @ApiOperation("瀵煎嚭鍛樺伐缁╂晥鏄庣粏")
+ @PostMapping("/exportUserSalary")
+ public void exportUserSalary (@RequestBody PageWrap<QueryUserSalaryListDTO> pageWrap, HttpServletResponse response) {
+ workorderRecordExtService.exportUserSalary(pageWrap,response);
+ }
+ @ApiOperation("瀵煎嚭宸ヨ祫鎶ヨ〃")
+ @PostMapping("/exportSalaryStatistics")
+ public void exportSalaryStatistics (@RequestBody PageWrap<QuerySalaryStatisticDTO> pageWrap, HttpServletResponse response) {
+ workorderRecordExtService.exportSalaryStatistics(pageWrap,response);
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
--
Gitblit v1.9.3