From 646fcec44623d2f9f557226face391af190c4a51 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 19 二月 2025 14:41:28 +0800
Subject: [PATCH] mapper层添加@param注解
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderFileMapper.java | 3 +
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductResultMapper.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderDeviceRecordMapper.java | 5 +-
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java | 40 ++++++++++----------
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java | 16 ++++----
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnPassMapper.java | 3 +
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java | 24 ++++++------
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 1
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java | 9 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 6 +++
12 files changed, 61 insertions(+), 52 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderDeviceRecordMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderDeviceRecordMapper.java
index 258dd57..ea79796 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderDeviceRecordMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderDeviceRecordMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.inspect.dto.InsOrderDeviceRecordDto;
import com.ruoyi.inspect.pojo.InsOrderDeviceRecord;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Set;
@@ -20,13 +21,13 @@
* @param insOrderId
* @return
*/
- List<InsOrderDeviceRecordDto> selectDeviceNumber(Integer insOrderId);
+ List<InsOrderDeviceRecordDto> selectDeviceNumber(@Param("insOrderId") Integer insOrderId);
/**
* 鏍规嵁缂栧彿鏌ヨ璁惧id
* @param deviceNumbers
* @return
*/
- List<Integer> selectDeviceIdsByNumbers(Set<String> deviceNumbers);
+ List<Integer> selectDeviceIdsByNumbers(@Param("deviceNumbers") Set<String> deviceNumbers);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderFileMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderFileMapper.java
index 8bd5432..f4f3c4a 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderFileMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderFileMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.inspect.pojo.InsOrderFile;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -16,5 +17,5 @@
*/
public interface InsOrderFileMapper extends BaseMapper<InsOrderFile> {
- IPage<InsOrderFile> getFileList(Page page, QueryWrapper<InsOrderFile> ew, Integer insOrderId);
+ IPage<InsOrderFile> getFileList(@Param("page") Page page, @Param("ew") QueryWrapper<InsOrderFile> ew, @Param("insOrderId") Integer insOrderId);
}
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..36ff9d0 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,31 @@
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);
+ 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(Set<String> names);
+ List<Map<String, String>> selectDeviceList(@Param("names") Set<String> names);
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(Integer id);
+ String getStandardMethodCode(@Param("id") Integer id);
- int updateStatus( Integer id);
+ int updateStatus(@Param("id") 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 +65,65 @@
* @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);
+ 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);
+ InsOrder selectFirstSubmit(@Param("insSampleId") Integer insSampleId);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
index 52a8ef0..bfb7115 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
@@ -19,19 +19,19 @@
*/
public interface InsProductMapper extends BaseMapper<InsProduct> {
- int selectOrderManDay(Integer orderId);
+ int selectOrderManDay(@Param("orderId") Integer orderId);
- Map<String, String> selectUserById(Integer userId);
+ Map<String, String> selectUserById(@Param("userId") Integer userId);
- List<ProductResultDto2> getProductAndResult(Integer sampleId);
+ List<ProductResultDto2> getProductAndResult(@Param("sampleId") Integer sampleId);
int updateInspected(@Param("id") Integer id);
- List<InsProduct> selectFiberInsProduct(List<Integer> ids, String laboratory);
+ List<InsProduct> selectFiberInsProduct(@Param("ids") List<Integer> ids, @Param("laboratory") String laboratory);
- IPage<InsProduct> selectNoProducts(Page page, Integer orderId, List<Integer> noIds);
+ IPage<InsProduct> selectNoProducts(@Param("page") Page page, @Param("orderId") Integer orderId, @Param("noIds") List<Integer> noIds);
- int selectInsProductCountByOrderId(Integer orderId);
+ int selectInsProductCountByOrderId(@Param("orderId") Integer orderId);
/**
* 鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鐩�
@@ -52,14 +52,14 @@
* @param orderId
* @return
*/
- List<String> selectUnqualifiedList(Integer orderId);
+ List<String> selectUnqualifiedList(@Param("orderId") Integer orderId);
/**
* 鏌ヨ鍒ゆ柇鏄惁鏈変笉鍒ゅ畾椤圭洰,鍜屽叏閮芥槸鍒ゅ畾椤�
* @param orderId
* @return
*/
- int selectNoJudge(Integer orderId);
+ int selectNoJudge(@Param("orderId") Integer orderId);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductResultMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductResultMapper.java
index 6ce0f27..57e640d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductResultMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductResultMapper.java
@@ -21,7 +21,7 @@
* @param orderId
* @return
*/
- List<InsProductResult> selectResultByOrderId(Integer orderId);
+ List<InsProductResult> selectResultByOrderId(@Param("orderId") Integer orderId);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java
index f9be2da..3f6176e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java
@@ -29,7 +29,7 @@
@Param("queryStatus") String queryStatus,
@Param("createOrderUser") Integer createOrderUser);
- String getLaboratoryByName(String name, String type);
+ String getLaboratoryByName(@Param("name") String name, @Param("type") String type);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
index b074da0..633ebc1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
@@ -34,22 +34,22 @@
IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
- List<SampleProductDto> selectSampleProductListByOrderId(Integer id);
+ List<SampleProductDto> selectSampleProductListByOrderId(@Param("id") Integer id);
- List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);
+ List<SampleProductDto> selectSampleProductListByOrderId2(@Param("id") Integer id);
- Map<String,Object> selectInsOrder(Integer id);
+ Map<String,Object> selectInsOrder(@Param("id") Integer id);
- List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
+ List<SampleProductDto> getInsOrderAndSample(@Param("id") Integer id, @Param("laboratory") String laboratory);
- String getSampleEn(String sample);
+ String getSampleEn(@Param("sample") String sample);
/**
* 鍙兘娌℃湁浜у搧鐩存帴灏辨槸瀵硅薄
* @param sample
* @return
*/
- String getSampleEnByObject(String sample);
+ String getSampleEnByObject(@Param("sample") String sample);
/**
* 鏍峰搧
@@ -57,7 +57,7 @@
* @param laboratory
* @return
*/
- List<InsProduct> getInsProduct1(Integer id, String laboratory, String cableTag, String repetitionTag, String isDisqualification);
+ List<InsProduct> getInsProduct1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag, @Param("repetitionTag") String repetitionTag, @Param("isDisqualification") String isDisqualification);
/**
@@ -67,11 +67,11 @@
* @param rawMaterialTag
* @return
*/
- List<InsProduct> getInsProduct6(Integer id, String laboratory, String rawMaterialTag, String isDisqualification);
+ List<InsProduct> getInsProduct6(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("rawMaterialTag") String rawMaterialTag, @Param("isDisqualification") String isDisqualification);
- SampleVo getDetailById(Integer sampleId);
+ SampleVo getDetailById(@Param("sampleId") Integer sampleId);
- String selMethodById(Integer sampleId);
+ String selMethodById(@Param("sampleId") Integer sampleId);
/**
* 鐢电紗閰嶇疆鏌ョ湅閰嶇疆鏍囪瘑
@@ -98,7 +98,7 @@
List<Map<String, Object>> getRepetitionTag(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag);
- List<SampleProductDto> selectExemptionByOrderId(Integer id);
+ List<SampleProductDto> selectExemptionByOrderId(@Param("id") Integer id);
/**
* 鏌ヨ鍘傚瀵嗗害(鏈夊瀷鍙�)
@@ -122,7 +122,7 @@
* @param itemIds
* @return
*/
- List<InsProduct> selectProductResult(List<Integer> itemIds);
+ List<InsProduct> selectProductResult(@Param("itemIds") List<Integer> itemIds);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnPassMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnPassMapper.java
index d818dd2..2e55796 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnPassMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnPassMapper.java
@@ -5,11 +5,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.inspect.dto.UnPassPageDto;
import com.ruoyi.inspect.pojo.InsUnPass;
+import org.apache.ibatis.annotations.Param;
/**
* @author 鏈变匠鍚�
* @date 2024/5/8 13:05
*/
public interface InsUnPassMapper extends BaseMapper<InsUnPass> {
- IPage<UnPassPageDto> pageInsUnPass(IPage<UnPassPageDto> page, QueryWrapper<UnPassPageDto> ew);
+ IPage<UnPassPageDto> pageInsUnPass(@Param("page") IPage<UnPassPageDto> page, @Param("ew") QueryWrapper<UnPassPageDto> ew);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java
index ad27c5c..171980b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java
@@ -23,7 +23,7 @@
IPage<UnqualifiedHandlerVO> selectPageList(IPage<UnqualifiedHandlerVO> page, @Param("ew")QueryWrapper<UnqualifiedHandlerDto> ew);
- UnqualifiedHandlerVO findById(Long id);
+ UnqualifiedHandlerVO findById(@Param("id") Long id);
/**
* 鏌ョ湅oa娴佺▼
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java
index 440ca63..6ff1a4c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestProductMapper.java
@@ -4,6 +4,7 @@
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -20,15 +21,15 @@
* @param ids
* @return
*/
- List<InsUnqualifiedRetestProduct> selectRetestProduct(List<Integer> ids);
+ List<InsUnqualifiedRetestProduct> selectRetestProduct(@Param("ids") List<Integer> ids);
// 鏍峰搧
- List<InsProduct> getInsProductUnqualifiedRetest1(Integer id, String laboratory, String retestTag);
+ List<InsProduct> getInsProductUnqualifiedRetest1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("retestTag") String retestTag);
// 鐢电紗閰嶇疆
- List<InsProduct> getInsProductUnqualifiedRetest5(Integer id, String laboratory, String cableTag, String retestTag);
+ List<InsProduct> getInsProductUnqualifiedRetest5(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag, @Param("retestTag") String retestTag);
// 鍘熸潗鏂欎笅鍗�
- List<InsProduct> getInsProductUnqualifiedRetest6(Integer id, String laboratory, String rawMaterialTag, String retestTag);
+ List<InsProduct> getInsProductUnqualifiedRetest6(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("rawMaterialTag") String rawMaterialTag, @Param("retestTag") String retestTag);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index abb2686..aeba583 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -96,7 +96,6 @@
isOrderAll = "1";
sampleOrderDto.setState(null);
}
- IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), laboratory, isOrderAll);
return insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), laboratory, isOrderAll);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index 8a25b60..802bd22 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -25,6 +25,12 @@
@Resource
private UserService userService;
+ /**
+ * type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ * @param user
+ * @param type
+ * @return
+ */
@ApiOperation(value = "鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃")
@GetMapping("/selectUserCondition")
public Result selectUserCondition(User user, String type){
--
Gitblit v1.9.3