From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index f6661dc..51bd971 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -156,10 +156,18 @@
// 淇敼鍚嶇О鍖归厤鐨勬爣鍑嗘爲涓嬬殑妫�楠岄」鐩�
// 鏌ヨ鎵�鏈夊璞�+鍚嶇О鐨勬爲
- List<StandardProductList> standardProductLists = standardProductListService.list(Wrappers.<StandardProductList>lambdaUpdate()
- .eq(StandardProductList::getSample, standardTree.getSample())
+ LambdaUpdateWrapper<StandardProductList> updateWrapper = Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getFactory, standardTree.getFactory())
+ .eq(StandardProductList::getLaboratory, standardTree.getLaboratory())
.eq(StandardProductList::getSampleType, standardTree.getSampleType())
- .eq(StandardProductList::getModel, standardTree.getOldModel()));
+ .eq(StandardProductList::getModel, standardTree.getOldModel());
+ if (StringUtils.isNotBlank(standardTree.getSample()) && !standardTree.getSample().equals("null")) {
+ updateWrapper.eq(StandardProductList::getSample, standardTree.getSample());
+ } else {
+ updateWrapper.isNull(StandardProductList::getSample);
+ }
+
+ List<StandardProductList> standardProductLists = standardProductListService.list(updateWrapper);
if (CollectionUtils.isNotEmpty(standardProductLists)) {
for (StandardProductList standardProductList : standardProductLists) {
// 淇敼鏍峰搧鍚嶇О
@@ -182,8 +190,10 @@
.eq(StandardTree::getSampleType, standardTree.getSampleType())
.eq(StandardTree::getModel, standardTree.getOldModel())
.set(StandardTree::getModel, standardTree.getModel());
- if (StringUtils.isNotBlank(standardTree.getSample())) {
+ if (StringUtils.isNotBlank(standardTree.getSample()) && !standardTree.getSample().equals("null")) {
wrapper.eq(StandardTree::getSample, standardTree.getSample());
+ } else {
+ wrapper.isNull(StandardTree::getSample);
}
return standardTreeMapper.update(null, wrapper);
}
--
Gitblit v1.9.3