From b7586ba9b38136c7af8ca9b31f92f570a0b039c2 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期一, 21 八月 2023 18:02:35 +0800 Subject: [PATCH] 计量管理-》计量修改 试验管理-》合格率统计 --- laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java index 21bb7b6..f7ac33f 100644 --- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java +++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java @@ -4,9 +4,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.limslaboratory.pojo.MeteringPlan; import com.baomidou.mybatisplus.extension.service.IService; +import com.yuanchu.limslaboratory.pojo.MeteringPlanAndInfoAndIns; +import com.yuanchu.limslaboratory.pojo.MetricalInfoAndIns; +import com.yuanchu.limslaboratory.pojo.dto.AddPlanDto; +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.pojo.vo.UserAndInsVo; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -26,5 +32,11 @@ IPage<Map<String, Object>> pagingQueryOfMeasurementLedger(SelectMeasurementLedgerDto selectMeasurementLedgerDto); - Map<String, Object> getPlanMeasureInstrument(Integer id); + Map<String, Object> getPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto); + + Map<String, Object> limitGetPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto); + + UserAndInsVo getListUserAndListIns(List<Map<String, Object>> userNameAndId); + + boolean addPlanAndMeasure(Map<String, Object> userInfo, AddPlanDto addPlanDto); } -- Gitblit v1.9.3