From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 bc6ea21..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,9 @@
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;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -46,25 +49,27 @@
}
@ApiOperation("璁￠噺璁″垝鍒嗛〉鏌ヨ")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "measureCodeOrNameOrUnit", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true)
- })
@GetMapping("/plan_page_list")
- public Result<?> pagingQueryOfMeteringPlan(Integer pageNo, Integer pageSize, String measureCodeOrNameOrUnit) {
- IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeteringPlan(measureCodeOrNameOrUnit, new Page<Objects>(pageNo, pageSize));
- return Result.success(page);
+ public Result<?> pagingQueryOfMeteringPlan(SelectMeteringPlanDto dto) {
+ return Result.success(meteringPlanService.pagingQueryOfMeteringPlan(dto));
}
@ApiOperation("璁￠噺鍙拌处鍒嗛〉鏌ヨ")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true)
- })
@GetMapping("/standing_page_list")
- public Result<?> pagingQueryOfMeasurementLedger(Integer pageNo, Integer pageSize) {
- IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(new Page<Objects>(pageNo, pageSize));
+ public Result<?> pagingQueryOfMeasurementLedger(SelectMeasurementLedgerDto selectMeasurementLedgerDto) {
+ IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(selectMeasurementLedgerDto);
return Result.success(page);
}
+
+ @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