From de0202274ed147e89fdbba0a953936a3b9997ec7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 17:37:50 +0800
Subject: [PATCH] feat(mes): 更新IPQC过程检验功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java
index 0876690..af252fd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java
@@ -13,7 +13,7 @@
/**
* MES 鍑鸿揣妫�楠屽崟锛圤QC锛� Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesQcOqcMapper extends BaseMapperX<MesQcOqcDO> {
@@ -25,6 +25,7 @@
.likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode())
.eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId())
.eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult())
+ .betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate())
.orderByDesc(MesQcOqcDO::getId));
}
@@ -38,12 +39,16 @@
.likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode())
.eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId())
.eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult())
+ .betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate())
.orderByDesc(MesQcOqcDO::getId);
if (permittedClientIds != null) {
+ // 鏈～瀹㈡埛鐨勫崟鎹笉灞炰簬浠讳綍瀹㈡埛锛屼笉鍙楀鎴锋潈闄愰伄鎸�
if (CollUtil.isEmpty(permittedClientIds)) {
- return PageResult.empty();
+ wrapper.isNull(MesQcOqcDO::getClientId);
+ } else {
+ wrapper.and(w -> w.isNull(MesQcOqcDO::getClientId)
+ .or().in(MesQcOqcDO::getClientId, permittedClientIds));
}
- wrapper.in(MesQcOqcDO::getClientId, permittedClientIds);
}
return selectPage(reqVO, wrapper);
}
--
Gitblit v1.9.3