From 5d2ac1105b10ea776dbb5b2360165996c77b6351 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 八月 2025 10:39:40 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
index 71f3107..94f940a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java
@@ -47,24 +47,23 @@
if(CollectionUtils.isEmpty(query.getDispatchIds())){
return pageInfo;
}
- List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationMapper.selectList(null);
- List<TSamplingRecordVO> list = this.baseMapper.pageList(query);
+ List<TSamplingRecordVO> list = this.baseMapper.pageList(query,pageInfo);
if(CollectionUtils.isEmpty(list)){
return pageInfo;
}
- for (TSamplingRecordVO tSamplingRecordVO : list) {
- if (query.getRoleType()==5){
- if (tSamplingRecordVO.getStatus()==2){
- List<TSamplingRecordOperation> samplingRecordOperationsIds = samplingRecordOperations.stream().filter(e -> e.getSamplingId().equals(tSamplingRecordVO.getId())).collect(Collectors.toList());
- // 如果samplingRecordOperationsIds的状态全部都为3
- if(!samplingRecordOperationsIds.stream().allMatch(e -> e.getStatus() == 3)){
- res.add(tSamplingRecordVO);
- }
- }
- }else{
- res.add(tSamplingRecordVO);
- }
- }
+// for (TSamplingRecordVO tSamplingRecordVO : list) {
+// if (query.getRoleType()==5){
+// if (tSamplingRecordVO.getStatus()==1){
+// List<TSamplingRecordOperation> samplingRecordOperationsIds = samplingRecordOperations.stream().filter(e -> e.getSamplingId().equals(tSamplingRecordVO.getId())).collect(Collectors.toList());
+// // 如果samplingRecordOperationsIds的状态全部都为3
+// if(!samplingRecordOperationsIds.stream().allMatch(e -> e.getStatus() == 3)){
+// res.add(tSamplingRecordVO);
+// }
+// }
+// }else{
+// res.add(tSamplingRecordVO);
+// }
+// }
List<String> recordIds = list.stream().map(TSamplingRecordVO::getId).collect(Collectors.toList());
List<TSamplingRecordOperation> recordOperationList = samplingRecordOperationMapper.selectList(Wrappers.lambdaQuery(TSamplingRecordOperation.class)
.in(TSamplingRecordOperation::getSamplingId, recordIds));
@@ -95,9 +94,9 @@
}
}
// 手动对res进行分页
- res = res.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());
- pageInfo.setTotal(res.size());
- pageInfo.setRecords(res);
+// res = res.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());
+// pageInfo.setTotal(res.size());
+ pageInfo.setRecords(list);
return pageInfo;
}
}
--
Gitblit v1.7.1