From 4c563cb7274be53e15f8ce5537ef6e57e15b6458 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 02 四月 2024 18:01:31 +0800
Subject: [PATCH] 检验报告

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java |   64 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index dc47e67..70a7eb5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -4,22 +4,19 @@
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.dto.InsOderDto;
 import com.yuanchu.mom.dto.SampleOrderDto;
 import com.yuanchu.mom.dto.SampleProductDto;
 import com.yuanchu.mom.pojo.InsOrder;
-import com.yuanchu.mom.pojo.InsSample;
+import com.yuanchu.mom.pojo.InsOrderTemplate;
 import com.yuanchu.mom.service.InsOrderService;
+import com.yuanchu.mom.service.InsOrderTemplateService;
 import com.yuanchu.mom.service.InsProductService;
 import com.yuanchu.mom.service.InsSampleService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -29,6 +26,7 @@
 @RestController
 @AllArgsConstructor
 @RequestMapping("/insOrder")
+@Api("妫�楠屽崟妯″潡")
 public class InsOrderController {
 
     private InsOrderService insOrderService;
@@ -36,6 +34,8 @@
     private InsSampleService insSampleService;
 
     private InsProductService insProductService;
+
+    private InsOrderTemplateService insOrderTemplateService;
 
     //鑾峰彇妫�楠屼笅鍗曟暟鎹�
     @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
@@ -46,9 +46,9 @@
         return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
     }
 
-    @ApiOperation(value = "妫�楠屼笅鍙�")
+    @ApiOperation(value = "妫�楠屽垎閰�")
     @PostMapping("/upInsOrder")
-    public Result<?> upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId) {
+    public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
         return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId));
     }
 
@@ -61,7 +61,7 @@
         return Result.success(insOrderService.addInsOrder(list, insOrder));
     }
 
-    @ApiOperation(value = "鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿")
+    @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
     @PostMapping("/selectOrderManDay")
     @ValueAuth
     public Result<?> selectOrderManDay(Integer id) {
@@ -69,4 +69,48 @@
         return Result.success("鎴愬姛", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
     }
 
+    @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
+    @PostMapping("/getInsOrder")
+    @ValueAuth
+    public Result<?> getInsOrder(Integer orderId) {
+        return Result.success(insOrderService.getInsOrder(orderId));
+    }
+
+    @ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "妫�楠屽崟id"),
+            @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃")
+    })
+    @PostMapping("/upInsOrderOfState")
+    public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
+        return Result.success(insOrderService.upInsOrderOfState(insOrder));
+    }
+
+    @ApiOperation(value = "娣诲姞妫�楠屽崟妯℃澘")
+    @PostMapping("/addInsOrderTemplate")
+    public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
+        return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
+    }
+
+    @ApiOperation(value = "鏌ヨ妫�楠屽崟妯℃澘")
+    @GetMapping("/selectInsOrderTemplate")
+    @ValueAuth
+    public Result<?> selectInsOrderTemplate() {
+        return Result.success(insOrderTemplateService.selectInsOrderTemplate());
+    }
+
+    @ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
+    @PostMapping("/selectInsOrderTemplateById")
+    @ValueAuth
+    public Result<?> selectInsOrderTemplateById(Integer id) {
+        return Result.success("鎴愬姛", insOrderTemplateService.selectInsOrderTemplateById(id));
+    }
+
+    @ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
+    @PostMapping("/delInsOrderTemplate")
+    @ValueAuth
+    public Result<?> delInsOrderTemplate(Integer id) {
+        return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
+    }
+
 }

--
Gitblit v1.9.3