From aa423b168ac997db1b52cb4636498245f93a26a2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 18 八月 2023 18:08:19 +0800
Subject: [PATCH] 计量管理-》新增计划计量

---
 laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
index b877166..44b2456 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.limslaboratory.pojo.Instrument;
 import com.yuanchu.limslaboratory.pojo.MeteringPlan;
+import com.yuanchu.limslaboratory.pojo.dto.GetPlanMeasureInstrumentDto;
 import com.yuanchu.limslaboratory.pojo.dto.SelectMeasurementLedgerDto;
 import com.yuanchu.limslaboratory.pojo.dto.SelectMeteringPlanDto;
 import com.yuanchu.limslaboratory.service.MeteringPlanService;
@@ -60,10 +61,15 @@
         return Result.success(page);
     }
 
-    @ApiOperation("鏌ヨ璁¢噺淇℃伅")
-    public Result<?> getPlanMeasureInstrument(Integer id){
-        return Result.success(meteringPlanService.getPlanMeasureInstrument(id));
+    @ApiOperation("鍗曡璁″垝淇℃伅")
+    @GetMapping("/getPlanMeasureInstrument")
+    public Result<?> getPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto){
+        return Result.success(meteringPlanService.getPlanMeasureInstrument(dto));
     }
 
-
+    @ApiOperation("璁″垝淇℃伅涔嬩笅鍒嗛〉")
+    @GetMapping("/limitGetPlanMeasureInstrument")
+    public Result<?> limitGetPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto){
+        return Result.success(meteringPlanService.limitGetPlanMeasureInstrument(dto));
+    }
 }

--
Gitblit v1.9.3