From 28231163c688c379a688ce6878a1126ee218aa52 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期二, 26 九月 2023 16:53:48 +0800
Subject: [PATCH] 煤矿功能
---
exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EmonRecordManagerServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EmonRecordManagerServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EmonRecordManagerServiceImpl.java
index 60596a3..02916fa 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EmonRecordManagerServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EmonRecordManagerServiceImpl.java
@@ -18,6 +18,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.file.entity.AttachmentInfo;
import com.ruoyi.file.service.AttachmentService;
+import com.ruoyi.system.service.SysDistrictService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -26,6 +27,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -41,6 +43,9 @@
@Resource
private AttachmentService attachmentService;
+
+ @Resource
+ private SysDistrictService sysDistrictService;
@Resource
private EmonExamRecordService emonExamRecordService;
@@ -106,7 +111,9 @@
@Override
public List<GetExamDataRespDTO> getExamData() {
- List<EmonExamRecord> emonExamRecords = emonExamRecordService.listValid();
+ Long districtId = SecurityUtils.getLoginUser().getUser().getDistrictId();
+ List<Long> childrenIds = sysDistrictService.selectChildrenIdsById(districtId);
+ List<EmonExamRecord> emonExamRecords = emonExamRecordService.listValid(childrenIds);
if (!CollectionUtils.isEmpty(emonExamRecords)){
List<GetExamDataRespDTO> list = emonExamRecords.stream().map(emonExamRecord -> {
GetExamDataRespDTO dto = new GetExamDataRespDTO();
@@ -128,12 +135,14 @@
}).collect(Collectors.toList());
return list;
}
- return null;
+ return new ArrayList<>();
}
@Override
public List<GetTrainDataRespDTO> getTrainData() {
- List<EmonTrainRecord> emonTrainRecords = emonTrainRecordService.listValid();
+ Long districtId = SecurityUtils.getLoginUser().getUser().getDistrictId();
+ List<Long> childrenIds = sysDistrictService.selectChildrenIdsById(districtId);
+ List<EmonTrainRecord> emonTrainRecords = emonTrainRecordService.listValid(childrenIds);
if (!CollectionUtils.isEmpty(emonTrainRecords)){
List<GetTrainDataRespDTO> list = emonTrainRecords.stream().map(emonTrainRecord -> {
GetTrainDataRespDTO dto = new GetTrainDataRespDTO();
@@ -155,7 +164,7 @@
}).collect(Collectors.toList());
return list;
}
- return null;
+ return new ArrayList<>();
}
@Override
--
Gitblit v1.9.2