From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期一, 28 八月 2023 13:30:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java index 3f9d8d4..cc8df9c 100644 --- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java +++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java @@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.limslaboratory.pojo.Report; -import com.yuanchu.limslaboratory.pojo.vo.ReportCheckVo; import com.yuanchu.limslaboratory.pojo.vo.ReportVo; + +import java.util.Map; /** * <p> @@ -24,10 +25,8 @@ */ IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name); - /** - * 鏌ヨ鎶ュ憡瀹℃牳 - * @return - */ - IPage<ReportCheckVo> selectAllReportCheck(Page<Object> page, Integer status, String name); + Map<String, Object> getReportContext(String code); + + } -- Gitblit v1.9.3