From 25e115da7815430fdc5d078d4a01d76edacb4e6f Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 06 五月 2025 16:39:04 +0800
Subject: [PATCH] 质量监督添加被监督人签名
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 36ff9d0..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
@@ -34,14 +34,8 @@
IPage<SampleProductDto2> selectSampleAndProductByOrderId(@Param("page") IPage<SampleProductDto2> page, @Param("ew") QueryWrapper<SampleProductDto2> ew, @Param("id") Integer id);
- IPage<CostStatisticsDto> selectCostStatistics(@Param("page") IPage<CostStatisticsDto> page, @Param("ew") QueryWrapper<CostStatisticsDto> ew);
-
- List<CostStatisticsDto> selectCostStatistics2(@Param("ew") QueryWrapper<CostStatisticsDto> ew);
-
- List<Map<String, String>> selectDeviceList(@Param("names") 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);
@@ -116,6 +110,10 @@
*/
List<InsOrderPrintingVo> labelOrderPrinting(@Param("ids") List<Integer> ids);
+ /**
+ * 鏌ヨ瀵煎嚭淇℃伅
+ * @return
+ */
List<SampleOrderDto> rawAllInsOrderExport(@Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll);
/**
@@ -125,5 +123,17 @@
*/
String selectLaboratoryByOrderId(@Param("insOrderId") Integer insOrderId);
+ /**
+ * 鏌ヨ璁㈠崟淇℃伅
+ * @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