From 444409ba734d4457f9109f0b71422b83fed60cd6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 24 九月 2026 11:14:20 +0800
Subject: [PATCH] refactor(inspect): 重构设备列表查询和报告生成逻辑

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

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
index d418b17..d1662ae 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
@@ -30,14 +30,15 @@
 public interface InsOrderMapper extends BaseMapper<InsOrder> {
 
     //鑾峰彇妫�楠屼笅鍗曟暟鎹�
-    IPage<SampleOrderDto> selectInsOrderPage(@Param("page") IPage<InsOrder> page, @Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll);
+    IPage<SampleOrderDto> selectInsOrderPage(@Param("page") IPage<InsOrder> page, @Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll, @Param("receiptSubmitted") String receiptSubmitted);
 
 
     String getLaboratoryCode(@Param("name") String name);
 
     IPage<SampleProductDto2> selectSampleAndProductByOrderId(@Param("page") IPage<SampleProductDto2> page, @Param("ew") QueryWrapper<SampleProductDto2> ew, @Param("id") Integer id);
 
-    List<Map<String, String>> selectDeviceList(@Param("managementNumbers") Set<String> managementNumbers);
+    List<Map<String, String>> selectDeviceListByIds(@Param("deviceIds") Set<Integer> deviceIds);
+
     List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
 
     String getStandardMethodCode(@Param("id") Integer id);
@@ -56,6 +57,7 @@
 
     /**
      * 鏌ヨ妫�楠岀粨鏋�
+     *
      * @param ids
      * @return
      */
@@ -63,6 +65,7 @@
 
     /**
      * 鑾峰彇鎵归噺妫�楠岀殑鎬绘暟
+     *
      * @param id
      * @return
      */
@@ -70,6 +73,7 @@
 
     /**
      * 鑾峰彇绾胯姱棰滆壊
+     *
      * @param id
      * @return
      */
@@ -84,6 +88,7 @@
 
     /**
      * 鍙煡璇㈤粯璁ょ涓�涓殑浜у搧
+     *
      * @param id
      * @return
      */
@@ -91,6 +96,7 @@
 
     /**
      * 鏌ヨ鏃ュ巻鍥�
+     *
      * @param
      * @return
      */
@@ -112,6 +118,7 @@
 
     /**
      * 鎴愬搧鏍囩鎵撳嵃
+     *
      * @param ids
      * @return
      */
@@ -119,6 +126,7 @@
 
     /**
      * 澶栬喘浜у搧鏍囩鎵撳嵃
+     *
      * @param ids
      * @return
      */
@@ -126,12 +134,14 @@
 
     /**
      * 鏌ヨ瀵煎嚭淇℃伅
+     *
      * @return
      */
     List<SampleOrderDto> rawAllInsOrderExport(@Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll);
 
     /**
      * 鏍规嵁璁㈠崟鏌ヨ璇曢獙瀹�
+     *
      * @param insOrderId
      * @return
      */
@@ -139,6 +149,7 @@
 
     /**
      * 鏌ヨ璁㈠崟淇℃伅
+     *
      * @param insSampleId
      * @return
      */
@@ -146,6 +157,7 @@
 
     /**
      * 鏍规嵁璁㈠崟id鏌ヨ璁㈠崟瀵煎嚭淇℃伅
+     *
      * @param orderIds
      * @return
      */
@@ -153,6 +165,7 @@
 
     /**
      * 鏌ヨ褰撳墠鏃堕棿鏄惁鏈夎妫�娴嬮」鐨勬娊鏍疯鍒掕鍗�
+     *
      * @param itmeId    鏍峰搧Id
      * @param startTime 寮�濮嬫椂闂�
      * @param endTime   缁撴潫鏃堕棿

--
Gitblit v1.9.3