From cf347859a3a023f48bdb82e7702c0df8858759db Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期四, 10 八月 2023 13:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
index 106c79a..dd00306 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
@@ -1,24 +1,29 @@
 package com.yuanchu.limslaboratory.mapper;
 
-import com.yuanchu.limslaboratory.pojo.Inspection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
 
 import java.util.List;
 import java.util.Map;
 
 /**
- * <p>
- *  Mapper 鎺ュ彛
- * </p>
+ * 鐢宠琛�(Inspection)琛ㄦ暟鎹簱璁块棶灞�
  *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
+ * @author zss
+ * @since 2023-08-03 13:03:36
  */
 public interface InspectionMapper extends BaseMapper<Inspection> {
 
-    List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state);
 
-    int selectInspectToCount(Integer state);
-
+    /**
+     * 鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
+     * @param page
+     * @param message
+     * @return
+     */
+    IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message);
 }
+

--
Gitblit v1.9.3