From 44daca093696d96e822df6584866910f7316863b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 10 三月 2025 17:39:54 +0800
Subject: [PATCH] lims检测中心设备代码迁移
---
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 54 ++++++++----------------------------------------------
1 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index 4deb5df..ccb59a6 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -1,11 +1,10 @@
package com.ruoyi.basic.mapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.*;
-import com.ruoyi.basic.pojo.IfsInventoryQuantity;
+import com.ruoyi.basic.dto.FactoryDto;
+import com.ruoyi.basic.dto.ProductDto;
+import com.ruoyi.basic.dto.SampleDto;
+import com.ruoyi.basic.dto.SampleTypeDto;
import com.ruoyi.basic.pojo.StandardMethodList;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardTree;
@@ -31,62 +30,25 @@
List<StandardMethodList> getStandardMethodListBySample(String sampleType);
- List<StandardProductList> selectStandardProductListByTree(String tree, String sample, String model, String trees, String laboratory);
+ List<StandardProductList> selectStandardProductListByTree(@Param("tree") String tree, @Param("sample") String sample, @Param("model") String model, @Param("trees") String trees, @Param("laboratory") String laboratory);
- List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees, String laboratory);
+ List<StandardProductList> selectStandardProductListByTree2(@Param("tree") String tree, @Param("sample") String sample, @Param("model") String model, @Param("trees") String trees, @Param("laboratory") String laboratory);
+ List<StandardProductList> selectStandardProductListByTree3(@Param("tree") String tree, @Param("sample") String sample, @Param("model") String model, @Param("trees") String trees, @Param("laboratory") String laboratory);
List<SampleTypeDto> getStandardTree2();
List<SampleDto> getStandardTree3(String sampleType);
-
String getLaboratory(String str);
- Integer getStructureItemParameterId(String sampleType, String item, String itemChild, String inspectionItemClass);
+ Integer getStructureItemParameterId(@Param("sampleType") String sampleType, @Param("item") String item, @Param("itemChild") String itemChild, @Param("inspectionItemClass") String inspectionItemClass);
List<ProductDto> selectPList(String name);
String selSample(String sample);
- List<FactoryDto> selectStandardTreeListByPartNo(@Param("partNo") String partNo);
-
- IPage<IfsInventoryQuantity> selectIfsPage(IPage<IfsInventoryQuantity> page,
- @Param("ew") QueryWrapper<IfsInventoryQuantity> ew);
-
- IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page,
- @Param("ew") QueryWrapper<IfsInventoryQuantityDto> ew);
-
-
- IPage<IfsInventoryQuantityCheckDto> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, @Param("ew")QueryWrapper<IfsInventoryQuantityCheckDto> ew);
-
- /**
- * 鍘熸潗鎶ユ鏌ヨ鍏ㄩ儴(鍒嗛〉)
- * @param page
- * @param ew
- * @return
- */
- IPage<IfsInventoryQuantitySupplierDto> getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, @Param("ew") QueryWrapper<IfsInventoryQuantitySupplierDto> ew, @Param("beginDeclareDate") String beginDeclareDate, @Param("endDeclareDate")String endDeclareDate);
-
- /**
- * 鍘熸潗鎶ユ鏌ヨ鍏ㄩ儴(鏃犲垎椤�)
- * @param ew
- * @return
- */
- List<IfsInventoryQuantitySupplierDto> getIfsByOverList(@Param("ew") QueryWrapper<IfsInventoryQuantitySupplierDto> ew, @Param("beginDeclareDate") String beginDeclareDate, @Param("endDeclareDate")String endDeclareDate);
-
- /**
- * 鍘熸潗鏂欐煡璇㈠搴︽楠�
- * @param page
- * @param
- * @param beginDeclareDate
- * @param endDeclareDate
- * @return
- */
- IPage<IfsInventoryQuantitySupplierDto> getIfsByQuarter(Page<IfsInventoryQuantitySupplierDto> page, @Param("ew") QueryWrapper<IfsInventoryQuantitySupplierDto> ew, @Param("beginDeclareDate") String beginDeclareDate, @Param("endDeclareDate")String endDeclareDate);
-
}
-
--
Gitblit v1.9.3