From 00c23dd7d4a8f229d5c7fbe3439c6ea230fa7f48 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 16:20:21 +0800
Subject: [PATCH] 成品检验查询功能开发
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 45 ++++-----------------------------------------
1 files changed, 4 insertions(+), 41 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 537ac2e..2fe43b6 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;
}
@@ -210,14 +189,14 @@
auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
auxiliaryOutputWorkingHours.setPrice(insProduct.getPrice());//鍗曚环
auxiliaryOutputWorkingHours.setSampleId(insProduct.getInsSampleId());//鏍峰搧id
- auxiliaryOutputWorkingHours.setInsProductId(insProduct.getId());//妫�楠岄」id
+ auxiliaryOutputWorkingHours.setInsProductId(Math.toIntExact(insProduct.getId()));//妫�楠岄」id
return auxiliaryOutputWorkingHours;
}).collect(Collectors.toList());
// 鍒濇鍒嗛厤妫�楠屼汉锛屽悇涓楠岄」榛樿璁㈠崟鐨勬楠屼汉
List<Integer> insProductIds = insProductList.stream().map(insproduct -> {
- return insproduct.getId();
+ return Math.toIntExact(insproduct.getId());
}).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(insProductIds)){
insProductMapper.batchUpdateInsProductCheckUserId(insProductIds, userId);
@@ -327,7 +306,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
+ product.setStandardMethodListId(Long.valueOf(a.getInsulating().getStandardMethodListId()));
}
addInsProductMethod(a.getId(), ip2);
}
@@ -345,7 +324,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId());
+ product.setStandardMethodListId(Long.valueOf(a.getAuxiliaryWireCore().getStandardMethodListId()));
}
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