From 6d06746ec219cd9660fff07763182c1788ebfb20 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 11 四月 2025 14:52:01 +0800
Subject: [PATCH] 成品检验任务功能开发
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 7b2c20d..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,7 +91,6 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@Override
public IPage<SampleOrderDto> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
- //todo: 鍙湅鎴戝垽鏂叏閮�,涓汉,缁勭粐鐨勬潈闄�
String laboratory = null;
// 鍒ゆ柇鏄惁鏄叏閮�
String isOrderAll = null;
@@ -99,7 +98,12 @@
isOrderAll = "1";
sampleOrderDto.setState(null);
}
- return insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), laboratory, isOrderAll);
+ SampleOrderDto otherParam = new SampleOrderDto();
+ otherParam.setLaboratory(laboratory);
+ otherParam.setIsOrderAll(isOrderAll);
+ otherParam.setCheckUserId(SecurityUtils.getUserId());
+ IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), otherParam);
+ return sampleOrderDtoIPage;
}
@@ -185,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);
@@ -302,7 +306,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
+ product.setStandardMethodListId(a.getInsulating().getStandardMethodListIds().toString());
}
addInsProductMethod(a.getId(), ip2);
}
@@ -320,7 +324,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId());
+ product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId().toString());
}
addInsProductMethod(a.getId(), ip2);
}
--
Gitblit v1.9.3