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/service/impl/MeteringPlanServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java
index cd2cf23..eb42a3b 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java
@@ -3,11 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.pojo.Instrument;
-import com.yuanchu.limslaboratory.pojo.LimitPage;
-import com.yuanchu.limslaboratory.pojo.MeteringPlan;
+import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.mapper.MeteringPlanMapper;
-import com.yuanchu.limslaboratory.pojo.MeteringPlanAndInfo;
+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;
@@ -67,7 +65,22 @@
}
@Override
- public Map<String, Object> getPlanMeasureInstrument(Integer id) {
- return null;
+ public Map<String, Object> getPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto) {
+ MeteringPlanAndInfoAndIns planMeasureInstrument =
+ meteringPlanMapper.getPlanMeasureInstrument
+ (new LimitPage((dto.getCurrentPage()-1)*dto.getPageSize(),
+ dto.getPageSize()), dto.getId());
+ Map<String, Object> map = meteringPlanMapper.countPlanMeasurIns(dto.getId());
+ map.put("list",planMeasureInstrument);
+ return map;
+ }
+
+ @Override
+ public Map<String, Object> limitGetPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto) {
+ Map<String, Object> map = meteringPlanMapper.countPlanMeasurIns(dto.getId());
+ map.put("list",meteringPlanMapper
+ .limitGetPlanMeasureInstrument(new LimitPage((dto.getCurrentPage()-1)*dto.getPageSize()
+ ,dto.getPageSize()),dto.getId()));
+ return map;
}
}
--
Gitblit v1.9.3