From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 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..f295f87 100644
--- a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
@@ -4,10 +4,12 @@
import doumeemes.api.BaseController;
import doumeemes.config.rocketmq.RocketMessageProducer;
import doumeemes.core.annotation.pr.PreventRepeat;
+import doumeemes.core.annotation.trace.Trace;
import doumeemes.core.model.ApiResponse;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.Constants;
+import doumeemes.dao.business.dto.AutoWorkReportDTO;
import doumeemes.dao.business.dto.CreateMaterialDTO;
import doumeemes.dao.business.dto.DealWorkorderRecordDTO;
import doumeemes.dao.business.model.Workorder;
@@ -15,11 +17,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;
@@ -44,6 +44,7 @@
@RestController
@RequestMapping("/ext/workorderRecordExt")
@Api(tags = "宸ュ崟鐢熶骇杩囩▼璁板綍鎺ュ彛")
+@Trace(withRequestResult = false,withRequestParameters = false)
public class WorkorderRecordExtController extends BaseController {
@Autowired
@@ -85,19 +86,30 @@
return ApiResponse.success(id);
}
-
@PreventRepeat
- @ApiOperation("纭鎶ュ伐")
+ @ApiOperation(value = "纭鎶ュ伐" ,notes = "1.0.2鏇存柊")
@PostMapping("/comfirmDoneStandard")
@RequiresPermissions("ext:workorderrecordext:create")
- public ApiResponse comfirmDoneStandard(@RequestBody Workorder param) {
- Integer id =workorderRecordStandardService.comfirmDone(param);
+ public ApiResponse comfirmDoneStandard(@RequestBody AutoWorkReportDTO autoWorkReportDTO) {
+ Workorder workorder =workorderRecordStandardService.comfirmDoneNew(autoWorkReportDTO,true);
//鍙戦�佹秷鎭槦鍒楀鐞嗗垎浜搷浣�
- workorderExtService.statisticNum(param);
+ workorderExtService.statisticNumAsync(workorder);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+// @PreventRepeat
+// @ApiOperation("纭鎶ュ伐锛堝純鐢級")
+// @PostMapping("/comfirmDoneStandard")
+// @RequiresPermissions("ext:workorderrecordext:create")
+// public ApiResponse comfirmDoneStandard(@RequestBody Workorder param) {
+// Integer id =workorderRecordStandardService.comfirmDone(param,true);
+// //鍙戦�佹秷鎭槦鍒楀鐞嗗垎浜搷浣�
+// workorderExtService.statisticNum(param);
// RocketMessageProducer.producerMsg(Constants.MQ_TAG.statistics,null, JSONObject.toJSONString(param));
// rabbitTemplate.convertAndSend(Constants.MqTopicKeys.TOPIC_STATISTIC_NUM, Constants.MqTopicKeys.TOPIC_STATISTIC_NUM, JSONObject.toJSONString(param));
- return ApiResponse.success(id);
- }
+// return ApiResponse.success("");
+// }
@PreventRepeat
@ApiOperation("鏂板缓浜у嚭")
@@ -142,6 +154,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")
@@ -165,11 +183,27 @@
- @ApiOperation("瀵煎嚭Excel")
+ @ApiOperation("鐢熶骇浜у嚭瀵煎嚭Excel")
@PostMapping("/exportExcel")
// @RequiresPermissions("ext:workorderrecordext:exportExcel")
public void exportExcel (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
workorderRecordExtService.exportExcel(pageWrap,response);
+ }
+
+ @ApiOperation("鐢熶骇鎶曟枡瀵煎嚭Excel")
+ @PostMapping("/exportExcelFeeding")
+ public void exportExcelFeeding(@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response){
+ workorderRecordExtService.exportExcel2(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鏌ヨ")
@@ -210,6 +244,10 @@
return ApiResponse.success(workorderRecordStandardService.choiceStockPageForWorkorder(pageWrap,getLoginUser()));
}
-
+ @ApiOperation("鏍规嵁渚涢渶璁″垝鏌ヨ鍙敤搴撳瓨")
+ @PostMapping("/getStockByPlansForStandard")
+ public ApiResponse<PageData<WStockExtListVO>> getStockByPlansForStandard (@RequestBody PageWrap<QueryWStockDto> pageWrap) {
+ return ApiResponse.success(workorderRecordStandardService.choiceStockPageForPlans(pageWrap,getLoginUser()));
+ }
}
--
Gitblit v1.9.3