From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 2625818..0876690 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
@@ -1,11 +1,14 @@
package cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
/**
* MES 鍑鸿揣妫�楠屽崟锛圤QC锛� Mapper
@@ -25,6 +28,26 @@
.orderByDesc(MesQcOqcDO::getId));
}
+ /**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ */
+ default PageResult<MesQcOqcDO> selectPage(MesQcOqcPageReqVO reqVO, List<Long> permittedClientIds) {
+ LambdaQueryWrapperX<MesQcOqcDO> wrapper = new LambdaQueryWrapperX<MesQcOqcDO>()
+ .likeIfPresent(MesQcOqcDO::getCode, reqVO.getCode())
+ .eqIfPresent(MesQcOqcDO::getClientId, reqVO.getClientId())
+ .likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode())
+ .eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId())
+ .eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult())
+ .orderByDesc(MesQcOqcDO::getId);
+ if (permittedClientIds != null) {
+ if (CollUtil.isEmpty(permittedClientIds)) {
+ return PageResult.empty();
+ }
+ wrapper.in(MesQcOqcDO::getClientId, permittedClientIds);
+ }
+ return selectPage(reqVO, wrapper);
+ }
+
default MesQcOqcDO selectByCode(String code) {
return selectOne(MesQcOqcDO::getCode, code);
}
--
Gitblit v1.9.3