From b8045b11ca8af95cb5aeba464bff589e0b9f53b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 五月 2024 18:08:13 +0800
Subject: [PATCH] 光纤配置三层架构+辅助工时的审核与批准逻辑修改
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 8144a25..56df2da 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -23,13 +23,13 @@
*/
@RestController
@RequestMapping("/insOrderPlan")
-@Api("/妫�楠屼换鍔�")
+@Api(tags = "妫�楠屼换鍔�")
@AllArgsConstructor
public class InsOrderPlanController {
private InsOrderPlanService insOrderPlanService;
- @ValueAuth
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@PostMapping("/selectInsOrderPlanList")
public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {
@@ -38,6 +38,17 @@
InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
}
+
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "妫�楠屽崟璇︽儏-浠诲姟鍒囨崲")
+ @PostMapping("/inspectionOrderDetailsTaskSwitching")
+ public Result inspectionOrderDetailsTaskSwitching(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ page.setOptimizeCountSql(false);
+ InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
+ return Result.success(insOrderPlanService.inspectionOrderDetailsTaskSwitching(page, insOrderPlanDTO));
+ }
+
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "璁ら浠诲姟璁″垝")
@PostMapping("/claimInsOrderPlan")
@@ -65,8 +76,8 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId, String laboratory) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory);
+ public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
+ int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser);
return num==1?Result.success():Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
--
Gitblit v1.9.3