From 6371f17b2056b6e4010cbdc60965d5eac12a5d98 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 15 十月 2024 18:27:29 +0800
Subject: [PATCH] 考核导出bug，人脸上传及时bug
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 72 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index cca9a63..d12887c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -317,22 +317,29 @@
// date = formatter.format(new Date());
// }
// }
-
+ //TODO:鏍囩bug淇
+ //娌℃湁鏍囩榛樿鍏ㄥ
+ if(CollectionUtils.isEmpty(exportDTO.getExamineTags())){
+ exportDTO.setExamineTags(Arrays.asList(0,1,2));
+ }
/** 瀵间笁寮爏heet */
//杞﹁締
- CheckIndexCar checkIndexCar = new CheckIndexCar();
-// checkIndexCar.setDate(date);
- checkIndexCar.setQuarter(exportDTO.getQuarter());
- checkIndexCar.setDeptId(exportDTO.getDeptId());
- checkIndexCar.setDeptIds(exportDTO.getDeptIds());
- //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
- roleControl(checkIndexCar);
List<CheckIndexCar> checkIndexCars = new ArrayList<>();
+ //杞﹁締鍜屼汉鑴告病鏈夊叕瀹夐儴
for (Integer examineTag : exportDTO.getExamineTags()) {
+ if(examineTag ==2) continue;
+ CheckIndexCar checkIndexCar = new CheckIndexCar();
+// checkIndexCar.setDate(date);
+ checkIndexCar.setQuarter(exportDTO.getQuarter());
+ checkIndexCar.setDeptId(exportDTO.getDeptId());
+ checkIndexCar.setDeptIds(exportDTO.getDeptIds());
+ //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
+ roleControl(checkIndexCar);
checkIndexCar.setExamineTag(Short.valueOf(examineTag + ""));
if (examineTag == 0) {
- checkIndexCar.setExamineTagQuery(1);
+ checkIndexCar.setProvinceTag(Boolean.TRUE);
}
+
checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar));
}
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -368,18 +375,19 @@
}
ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCarVOS, CheckIndexCarVO.class);
//浜鸿劯
- CheckIndexFace checkIndexFace = new CheckIndexFace();
-// checkIndexFace.setDate(date);
- checkIndexFace.setQuarter(exportDTO.getQuarter());
- checkIndexFace.setDeptId(exportDTO.getDeptId());
- checkIndexFace.setDeptIds(exportDTO.getDeptIds());
- //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
- roleControl(checkIndexFace);
List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
for (Integer examineTag : exportDTO.getExamineTags()) {
+ if(examineTag ==2) continue;
+ CheckIndexFace checkIndexFace = new CheckIndexFace();
+// checkIndexFace.setDate(date);
+ checkIndexFace.setQuarter(exportDTO.getQuarter());
+ checkIndexFace.setDeptId(exportDTO.getDeptId());
+ checkIndexFace.setDeptIds(exportDTO.getDeptIds());
+ //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
+ roleControl(checkIndexFace);
checkIndexFace.setExamineTag(Short.valueOf(examineTag + ""));
if (examineTag == 0) {
- checkIndexFace.setExamineTagQuery(1);
+ checkIndexFace.setProvinceTag(Boolean.TRUE);
}
checkIndexFaces.addAll(indexFaceService.selectCheckIndexFaceList(checkIndexFace));
}
@@ -416,18 +424,21 @@
}
ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaceVOS, CheckIndexFaceVO.class);
//瑙嗛
- CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
-// checkIndexVideo.setDate(date);
- checkIndexVideo.setQuarter(exportDTO.getQuarter());
- checkIndexVideo.setDeptId(exportDTO.getDeptId());
- checkIndexVideo.setDeptIds(exportDTO.getDeptIds());
- //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
- roleControl(checkIndexVideo);
List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
for (Integer examineTag : exportDTO.getExamineTags()) {
+ CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
+// checkIndexVideo.setDate(date);
+ checkIndexVideo.setQuarter(exportDTO.getQuarter());
+ checkIndexVideo.setDeptId(exportDTO.getDeptId());
+ checkIndexVideo.setDeptIds(exportDTO.getDeptIds());
+ //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
+ roleControl(checkIndexVideo);
checkIndexVideo.setExamineTag(Short.valueOf(examineTag + ""));
if (examineTag == 0) {
- checkIndexVideo.setExamineTagQuery(1);
+ checkIndexVideo.setProvinceTag(Boolean.TRUE);
+ }else if(examineTag ==2){
+ //鍙湁瑙嗛鏈夊叕瀹夐儴鏁版嵁
+ checkIndexVideo.setDeptTag(Boolean.TRUE);
}
checkIndexVideos.addAll(indexVideoService.selectCheckIndexVideoList(checkIndexVideo));
}
@@ -456,6 +467,17 @@
//鏍规嵁绉垎闄嶅簭
checkIndexVideos.addAll(videos.stream().sorted(Comparator.comparing(CheckIndexVideo::getScore).reversed()).collect(Collectors.toList()));
}
+ List<CheckIndexVideo> deptList = checkIndexVideos.stream().filter(video -> CheckConstants.Examine_Tag_Dept.equals(video.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(deptList)) {
+ Map<Long, List<CheckIndexVideo>> videoMap = deptList.stream().collect(Collectors.groupingBy(CheckIndexVideo::getDeptId));
+ List<CheckIndexVideo> videos = new ArrayList<>();
+ videoMap.forEach((deptId, list) -> {
+ CheckIndexVideo video = CheckIndexVideo.calculateAverage(list);
+ videos.add(video);
+ });
+ //鏍规嵁绉垎闄嶅簭
+ checkIndexVideos.addAll(videos.stream().sorted(Comparator.comparing(CheckIndexVideo::getScore).reversed()).collect(Collectors.toList()));
+ }
}
List<CheckIndexVideoVO> checkIndexVideoVOS = new ArrayList<>();
for (CheckIndexVideo indexVideo : checkIndexVideos) {
--
Gitblit v1.8.0