From eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 11 三月 2025 11:05:38 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java | 53 ++++++++++++-----------------------------------------
1 files changed, 12 insertions(+), 41 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
index f25f673..0942d94 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
@@ -3,10 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.vo.StandardProductVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
-import java.util.Map;
/**
* @author Administrator
@@ -20,48 +20,19 @@
StandardProductList getOne(@Param("standardMethodListId") Integer standardMethodListId, @Param("inspectionItem") String inspectionItem, @Param("sample") String sample, @Param("inspectionItemSubclass") String inspectionItemSubclass, @Param("model") String model, @Param("inspectionItemClass") String inspectionItemClass);
- List<StandardProductList> selectDetail(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("model") String model, @Param("isCableTag") String isCableTag);
+ List<StandardProductList> selectDetail(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("model") String model,@Param("sampleType") String sampleType,@Param("sample")String sample);
- List<StandardProductList> selectDetail2(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("tree") String tree, @Param("isCableTag") String isCableTag);
+ List<StandardProductList> selectDetail2(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("tree") String tree);
- /**
- * 鏌ヨ闆朵欢棰滆壊
- * @param partNo
- * @return
- */
- Map<String, String> selectPartColor(@Param("partNo") String partNo);
-
- /**
- * 鍖洪棿淇敼
- * @param productList
- * @return
- */
- void updateSection(@Param("productList") StandardProductList productList);
-
-
- /**
- * 浠庝笂寰�涓嬩慨鏀归『搴�
- * @param beginIndex 寮�濮嬩綅缃�
- * @param endIndex 缁撴潫浣嶇疆
- * @param methodId 鏍囧噯id
- * @param tree 鏍�
- */
- void updateSortUp(@Param("beginIndex") Integer beginIndex,
- @Param("endIndex") Integer endIndex,
- @Param("methodId") Integer methodId,
- @Param("tree") String tree);
-
- /**
- * 浠庝笅缃戜笂淇敼椤哄簭
- * @param beginIndex
- * @param endIndex
- * @param methodId
- * @param tree
- */
- void updateSortDown(@Param("beginIndex") Integer beginIndex,
- @Param("endIndex") Integer endIndex,
- @Param("methodId") Integer methodId,
- @Param("tree") String tree);
+ List<StandardProductVO> getStandardProductByInsProduct(
+ @Param("laboratory") String laboratory,
+ @Param("sampleType") String sampleType,
+ @Param("sample") String sample,
+ @Param("model") String model,
+ @Param("inspectionItem") String inspectionItem,
+ @Param("inspectionItemSubclass") String inspectionItemSubclass,
+ @Param("sonLaboratory") String sonLaboratory,
+ @Param("standardMethodListId") Integer standardMethodListId);
}
--
Gitblit v1.9.3