From 3450525681e6e290d80ee5d27d0aaca395b62c8f Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 01 二月 2024 14:42:14 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1
---
exam-system/src/main/java/com/gkhy/exam/coalmine/service/baseService/impl/EmonExamRecordServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/baseService/impl/EmonExamRecordServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/baseService/impl/EmonExamRecordServiceImpl.java
index 9b3f883..781a74a 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/baseService/impl/EmonExamRecordServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/baseService/impl/EmonExamRecordServiceImpl.java
@@ -7,6 +7,7 @@
import com.gkhy.exam.coalmine.service.baseService.EmonExamRecordService;
import com.ruoyi.common.enums.coalmineEnums.DeleteStatusEnum;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.List;
@@ -31,10 +32,13 @@
}
@Override
- public List<EmonExamRecord> listValid() {
+ public List<EmonExamRecord> listValid(List<Long> childrenIds) {
LambdaQueryWrapper<EmonExamRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(EmonExamRecord::getDelFlag, DeleteStatusEnum.NO.getStatus())
.orderByDesc(EmonExamRecord::getReportTime);
+ if (!CollectionUtils.isEmpty(childrenIds)){
+ wrapper.in(EmonExamRecord::getDistrictId,childrenIds);
+ }
return emonExamRecordMapper.selectList(wrapper);
}
}
--
Gitblit v1.9.2