From 218388d1cecbf8cf4ab5ba51d3c875a0f21e8998 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 09 四月 2025 13:24:31 +0800
Subject: [PATCH] 1.原辅料下单提交
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 868ba44..8ed35ba 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
@@ -105,7 +105,26 @@
otherParam.setIsOrderAll(isOrderAll);
otherParam.setCheckUserFlag(checkUserFlag);
otherParam.setCheckUserId(SecurityUtils.getUserId());
- return insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), otherParam);
+ 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;
}
@@ -191,14 +210,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);
@@ -308,7 +327,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
+ product.setStandardMethodListId(Long.valueOf(a.getInsulating().getStandardMethodListId()));
}
addInsProductMethod(a.getId(), ip2);
}
@@ -326,7 +345,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId());
+ product.setStandardMethodListId(Long.valueOf(a.getAuxiliaryWireCore().getStandardMethodListId()));
}
addInsProductMethod(a.getId(), ip2);
}
--
Gitblit v1.9.3