From cdefd6a50721e2c4ba6df850e1405419f9df3c31 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 13:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 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 160d923..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
@@ -1,10 +1,14 @@
package com.yuanchu.mom.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
@@ -19,29 +23,70 @@
*/
@RestController
@RequestMapping("/insOrderPlan")
+@Api(tags = "妫�楠屼换鍔�")
@AllArgsConstructor
public class InsOrderPlanController {
private InsOrderPlanService insOrderPlanService;
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@PostMapping("/selectInsOrderPlanList")
public Result selectInsOrderPlanList(@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.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")
public Result claimInsOrderPlan(@RequestBody InsOrderPlanDTO data) {
return Result.success(insOrderPlanService.claimInsOrderPlan(data));
}
-
+ @ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鎵ц妫�楠屾搷浣�")
@PostMapping("/doInsOrder")
- public Result<?> doInsOrder(Integer id) {
- return Result.success(insOrderPlanService.doInsOrder(id));
+ public Result<?> doInsOrder(Integer id, String laboratory) {
+ return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
+ }
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "浠诲姟浜ゆ帴")
+ @PostMapping("/upPlanUser")
+ public Result<?> upPlanUser(Integer userId, Integer orderId) {
+ return Result.success(insOrderPlanService.upPlanUser(userId, orderId));
+ }
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
+ @PostMapping("/verifyPlan")
+ public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
+ return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
+ }
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
+ @PostMapping("/submitPlan")
+ public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
+ int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser);
+ return num==1?Result.success():Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
+ @ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
+ @PostMapping("/saveInsContext")
+ @ValueAuth
+ public Result<?> saveInsContext(String param){
+ Map<String, Object> param2 = JSON.parseObject(param, Map.class);
+ insOrderPlanService.saveInsContext(param2);
+ return Result.success();
+ }
}
--
Gitblit v1.9.3