From fbde0b947b4641081b558302ea77d88c902c4cd1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 30 四月 2025 10:03:24 +0800
Subject: [PATCH] 可靠性计划优化检验项
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 41 ++---------------------------------------
1 files changed, 2 insertions(+), 39 deletions(-)
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 8ed35ba..513ba8c 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
@@ -91,8 +91,6 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@Override
public IPage<SampleOrderDto> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
- // TODO 閽堝浜哄憳鍋氭潈闄愬鐞� 鐩墠鍏堝妫�楠屼汉鍛樺仛鏁版嵁澶勭悊 濡傛灉鏄楠屼汉鍛樺彧鑳芥煡璇㈠埌妫�楠岄」鐩槸鑷繁鎴栬�呰鍗曞垎娲句汉鏄嚜宸辩殑璁㈠崟锛屼笉鏄楠屼汉鍛樼殑鏆傛椂鍏ㄦ煡
- boolean checkUserFlag = isCheckUser(SecurityUtils.getUserId().intValue());
String laboratory = null;
// 鍒ゆ柇鏄惁鏄叏閮�
String isOrderAll = null;
@@ -103,27 +101,8 @@
SampleOrderDto otherParam = new SampleOrderDto();
otherParam.setLaboratory(laboratory);
otherParam.setIsOrderAll(isOrderAll);
- otherParam.setCheckUserFlag(checkUserFlag);
otherParam.setCheckUserId(SecurityUtils.getUserId());
IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), otherParam);
- // 鎷兼帴妫�楠屼汉鏍规嵁妫�楠岄」鏉�
- if(CollectionUtils.isEmpty(sampleOrderDtoIPage.getRecords())){
- return sampleOrderDtoIPage;
- }
- List<Integer> orderIds = new ArrayList<>();
- for (SampleOrderDto record : sampleOrderDtoIPage.getRecords()) {
- orderIds.add(record.getId());
- }
- List<CheckUserDto> checkUserDtoList = insProductMapper.selectCheckUserNameByOrderIds(orderIds);
- for (SampleOrderDto record : sampleOrderDtoIPage.getRecords()) {
- Integer orderId = record.getId();
- for (CheckUserDto checkUserDto : checkUserDtoList) {
- if(orderId.equals(checkUserDto.getOrderId())) {
- record.setTestingName(checkUserDto.getCheckUserNames());
- break;
- }
- }
- }
return sampleOrderDtoIPage;
}
@@ -327,7 +306,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(Long.valueOf(a.getInsulating().getStandardMethodListId()));
+ product.setStandardMethodListId(a.getInsulating().getStandardMethodListIds().toString());
}
addInsProductMethod(a.getId(), ip2);
}
@@ -345,7 +324,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(Long.valueOf(a.getAuxiliaryWireCore().getStandardMethodListId()));
+ product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId().toString());
}
addInsProductMethod(a.getId(), ip2);
}
@@ -1055,22 +1034,6 @@
} catch (IOException e) {
throw new RuntimeException("瀵煎嚭澶辫触");
}
- }
-
-
- /**
- * 鍒ゆ柇鏄惁涓烘楠屼汉鍛�
- * @param userId
- * @return
- */
- public boolean isCheckUser(Integer userId) {
- List<User> userList = userMapper.selectQualityUserList();
- for (User user : userList) {
- if(userId.equals(user.getId())){
- return true;
- }
- }
- return false;
}
}
--
Gitblit v1.9.3