From af1ef97f554b67140773103a3e90bc95b80c5b54 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 21 四月 2025 08:54:05 +0800
Subject: [PATCH] 原材料和成品可根据选择行导出

---
 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java |   60 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 35 insertions(+), 25 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 33b9e4c..94a172a 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
@@ -27,31 +27,25 @@
 public interface InsOrderMapper extends BaseMapper<InsOrder> {
 
     //鑾峰彇妫�楠屼笅鍗曟暟鎹�
-    IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew, String laboratory, String isOrderAll);
+    IPage<SampleOrderDto> selectInsOrderPage(@Param("page") IPage<InsOrder> page, @Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll);
 
 
-    String getLaboratoryCode(String name);
+    String getLaboratoryCode(@Param("name") String name);
 
-    IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew, Integer id);
+    IPage<SampleProductDto2> selectSampleAndProductByOrderId(@Param("page") IPage<SampleProductDto2> page, @Param("ew") QueryWrapper<SampleProductDto2> ew, @Param("id") Integer id);
 
-    IPage<CostStatisticsDto> selectCostStatistics(IPage<CostStatisticsDto> page, QueryWrapper<CostStatisticsDto> ew);
-
-    List<CostStatisticsDto> selectCostStatistics2(@Param("ew") QueryWrapper<CostStatisticsDto> ew);
-
-    List<Map<String, String>> selectDeviceList(Set<String> names);
+    List<Map<String, String>> selectDeviceList(@Param("managementNumbers") Set<String> managementNumbers);
     List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
 
-    Long getCount(@Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
+    String getStandardMethodCode(@Param("id") Integer id);
 
-    String getStandardMethodCode(Integer id);
+    int updateStatus(@Param("id") Integer id);
 
-    int updateStatus( Integer id);
-
-    String selLaboratoryCode(String laboratory);
+    String selLaboratoryCode(@Param("laboratory") String laboratory);
 
     List<Map<Integer, Object>> selectReportModelByOrderId(@Param("id") Integer id, @Param("laboratory") String laboratory);
 
-    String seldepLimsId(int depLimsId);
+    String seldepLimsId(@Param("depLimsId") Integer depLimsId);
 
     /**
      * 鏌ヨ妫�楠岀粨鏋�
@@ -65,65 +59,81 @@
      * @param id
      * @return
      */
-    int selectSampleMax(Integer id);
+    int selectSampleMax(@Param("id") Integer id);
 
     /**
      * 鑾峰彇绾胯姱棰滆壊
      * @param id
      * @return
      */
-    List<String> selectSampleCableTag(Integer id);
+    List<String> selectSampleCableTag(@Param("id") Integer id);
 
     /**
      *
      * @param orderId
      * @return
      */
-    int selectSampleItemS(Integer orderId);
+    int selectSampleItemS(@Param("orderId") Integer orderId);
 
     /**
      * 鍙煡璇㈤粯璁ょ涓�涓殑浜у搧
      * @param id
      * @return
      */
-    List<SampleProductExportDto> selectSampleBySampleIdOne(Integer id);
+    List<SampleProductExportDto> selectSampleBySampleIdOne(@Param("id") Integer id);
 
     /**
      * 鏌ヨ鏃ュ巻鍥�
      * @param
      * @return
      */
-    List<Map<String, Object>> selectCalendarWorkByWeek(int day);
+    List<Map<String, Object>> selectCalendarWorkByWeek(@Param("day") Integer day);
 
     /**
      *
      * @param partNo
      * @return
      */
-    StructureTestObject selectProductByPartNo(String partNo);
+    StructureTestObject selectProductByPartNo(@Param("partNo") String partNo);
 
     /**
      *
      * @param partNo
      * @return
      */
-    StructureTestObject selectByPartNo(String partNo);
+    StructureTestObject selectByPartNo(@Param("partNo") String partNo);
 
     /**
      * 鎴愬搧鏍囩鎵撳嵃
      * @param ids
      * @return
      */
-    List<InsOrderPrintingVo> labelOrderPrinting(List<Integer> ids);
+    List<InsOrderPrintingVo> labelOrderPrinting(@Param("ids") List<Integer> ids);
 
-    List<SampleOrderDto> rawAllInsOrderExport(QueryWrapper<SampleOrderDto> ew,  String laboratory, String isOrderAll);
+    /**
+     * 鏌ヨ瀵煎嚭淇℃伅
+     * @return
+     */
+    List<SampleOrderDto> rawAllInsOrderExport(@Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll);
 
     /**
      * 鏍规嵁璁㈠崟鏌ヨ璇曢獙瀹�
      * @param insOrderId
      * @return
      */
-    String selectLaboratoryByOrderId(Integer insOrderId);
+    String selectLaboratoryByOrderId(@Param("insOrderId") Integer insOrderId);
 
-    InsOrder selectFirstSubmit(Integer insSampleId);
+    /**
+     * 鏌ヨ璁㈠崟淇℃伅
+     * @param insSampleId
+     * @return
+     */
+    InsOrder selectFirstSubmit(@Param("insSampleId") Integer insSampleId);
+
+    /**
+     * 鏍规嵁璁㈠崟id鏌ヨ璁㈠崟瀵煎嚭淇℃伅
+     * @param orderIds
+     * @return
+     */
+    List<SampleOrderDto> getInsOrderExportByIds(@Param("orderIds") List<String> orderIds);
 }

--
Gitblit v1.9.3