From 03ae4050059db5c9c708a3283214fe1f64b64ab2 Mon Sep 17 00:00:00 2001
From: "yyzh528@163.com" <yyzh528@163.com>
Date: Wed, 21 Jun 2023 09:15:01 +0800
Subject: [PATCH] =?UTF-8?q?fx:=E4=BF=AE=E5=A4=8D=E5=BE=AE=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=AF=BC=E8=87=B4=E5=89=8D=E7=AB=AF=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/feign/RemoteQmsSamplePlanService.java |  4 ++--
 .../controller/QmsSamplePlanController.java   | 20 +++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/feign/RemoteQmsSamplePlanService.java b/qms-api/src/main/java/com/foreverwin/iep/qms/feign/RemoteQmsSamplePlanService.java
index 82e6f17..3ec4ea8 100644
--- a/qms-api/src/main/java/com/foreverwin/iep/qms/feign/RemoteQmsSamplePlanService.java
+++ b/qms-api/src/main/java/com/foreverwin/iep/qms/feign/RemoteQmsSamplePlanService.java
@@ -10,10 +10,10 @@ import org.springframework.web.bind.annotation.*;
 @FeignClient(contextId = "remoteQmsSamplePlanService", value = "iep-qms")
 public interface RemoteQmsSamplePlanService {
 
-    @GetMapping("/sample-plan/{handle}/info")
+    @GetMapping("/sample-plan/api/{handle}/info")
     R<QmsSamplePlan> getById(@PathVariable("handle") String handle, @RequestHeader(SecurityConstants.FROM) String from);
 
-    @PostMapping("/sample-plan/calculate")
+    @PostMapping("/sample-plan/api/calculate")
     R<QmsSamplePlanDTO> calculate(@RequestBody QmsSamplePlanDTO qmsSamplePlanDTO,
                                   @RequestHeader(SecurityConstants.FROM) String from);
 }
\ No newline at end of file
diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsSamplePlanController.java b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsSamplePlanController.java
index ff31b1c..7919d24 100644
--- a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsSamplePlanController.java
+++ b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsSamplePlanController.java
@@ -102,20 +102,36 @@ public class QmsSamplePlanController {
      */
     @ApiOperation(value = "计算抽样数&允退数", notes = "计算抽样数&允退数")
     @SysLog("计算抽样数&允退数")
-    @Inner
     @PostMapping("/calculate")
     public R calculate(@RequestBody QmsSamplePlanDTO qmsSamplePlan) {
         return R.ok(qmsSamplePlanService.calculate(qmsSamplePlan));
     }
 
+    /**
+     * 计算抽样数&允退数
+     *
+     * @param qmsSamplePlan 抽样计划主表
+     * @return R
+     */
+    @Inner
+    @PostMapping("/api/calculate")
+    public R calculateApi(@RequestBody QmsSamplePlanDTO qmsSamplePlan) {
+        return R.ok(qmsSamplePlanService.calculate(qmsSamplePlan));
+    }
+
     @GetMapping("/ratio")
     public R getQmsSampleRatio() {
         return R.ok(qmsSampleRatioService.list());
     }
 
-    @Inner
     @GetMapping("/{handle}/info")
     public R getById(@PathVariable("handle") String handle) {
         return R.ok(qmsSamplePlanService.getById(handle));
     }
+
+    @Inner
+    @GetMapping("/api/{handle}/info")
+    public R getByIdApi(@PathVariable("handle") String handle) {
+        return R.ok(qmsSamplePlanService.getById(handle));
+    }
 }