From d425460023114e81caedc7a0430f9246ed3bb839 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 23 十月 2025 17:04:07 +0800
Subject: [PATCH] 报检：批次号字母转大写
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 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..1d69e5e 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
@@ -5,13 +5,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.StructureTestObject;
-import com.ruoyi.inspect.dto.CostStatisticsDto;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.dto.SampleProductDto2;
import com.ruoyi.inspect.dto.SampleProductExportDto;
import com.ruoyi.inspect.pojo.InsOrder;
+import com.ruoyi.inspect.vo.IfsOrderVO;
import com.ruoyi.inspect.vo.InsOrderPrintingVo;
import com.ruoyi.inspect.vo.SampleDefectsFatherVo;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -24,34 +25,29 @@
* @createDate 2024-03-12 16:17:55
* @Entity com.yuanchu.mom.pojo.InsOrder
*/
+@Mapper
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 +61,92 @@
* @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);
+
+ /**
+ * 鏌ヨ褰撳墠鏃堕棿鏄惁鏈夎妫�娴嬮」鐨勬娊鏍疯鍒掕鍗�
+ * @param itmeId 鏍峰搧Id
+ * @param startTime 寮�濮嬫椂闂�
+ * @param endTime 缁撴潫鏃堕棿
+ * @return
+ */
+ Integer selectNotSpotCheckOrder(@Param("itmeId") Integer itmeId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+ IfsOrderVO selectOrderInfoById(@Param("id") Integer id);
}
--
Gitblit v1.9.3