From 2eaeb19b16af087d17c186c6220bf64f2fc07f4f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:51:57 +0800
Subject: [PATCH] 手动下单:检验中订单撤销报错问题修复

---
 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java
index 3f6176e..9aebe59 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java
@@ -3,9 +3,13 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.inspect.dto.InsReportExport;
 import com.ruoyi.inspect.dto.ReportPageDto;
 import com.ruoyi.inspect.pojo.InsReport;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author Administrator
@@ -13,6 +17,7 @@
 * @createDate 2024-03-17 22:10:02
 * @Entity com.yuanchu.mom.pojo.InsReport
 */
+@Mapper
 public interface InsReportMapper extends BaseMapper<InsReport> {
 
     /**
@@ -29,8 +34,16 @@
                                        @Param("queryStatus") String queryStatus,
                                        @Param("createOrderUser") Integer createOrderUser);
 
-    String getLaboratoryByName(@Param("name") String name, @Param("type") String type);
+    String getLaboratoryByName(@Param("name") String name, @Param("type") String type,@Param("contract") String contract);
 
+    /**
+     * 鎶ュ憡鎶ヨ〃瀵煎嚭
+     * @return
+     */
+    List<InsReportExport> reportAllExport(@Param("ew") QueryWrapper<ReportPageDto> ew,
+                                          @Param("userId") Integer userId,
+                                          @Param("queryStatus") String queryStatus,
+                                          @Param("createOrderUser") Integer createOrderUser);
 }
 
 

--
Gitblit v1.9.3