From 5dccf0dc687dfef1c91936af3cea06fe0609b918 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 十二月 2024 17:31:11 +0800
Subject: [PATCH] osd时间bug、离线工单bug等
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 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 82c2ad2..1a7ea32 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
@@ -183,20 +183,26 @@
private void getCheckScore(CheckScore checkScore, Calendar calendar) {
// 0.鐪佸巺鏈堝害 1.鐪佸巺瀛ｅ害 2.甯傚眬鏈堝害 3.甯傚眬瀛ｅ害 4.鍏畨閮ㄦ湀搴� 5.鍏畨閮ㄥ搴�
switch (checkScore.getExamineTag()) {
- case 0, 2 ,4:
+ case 0, 2, 4:
checkScore.setEndDate(calendar.getTime());
calendar.set(Calendar.DAY_OF_MONTH, 1);
checkScore.setStartDate(calendar.getTime());
- if(checkScore.getExamineTag() == 0) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
- if(checkScore.getExamineTag() == 2) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
- if(checkScore.getExamineTag() == 4) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
+ if (checkScore.getExamineTag() == 0)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province + ""));
+ if (checkScore.getExamineTag() == 2)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County + ""));
+ if (checkScore.getExamineTag() == 4)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept + ""));
break;
case 1, 3, 5:
checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime());
checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime());
- if(checkScore.getExamineTag() == 1) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
- if(checkScore.getExamineTag() == 3) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
- if(checkScore.getExamineTag() == 5) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
+ if (checkScore.getExamineTag() == 1)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province + ""));
+ if (checkScore.getExamineTag() == 3)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County + ""));
+ if (checkScore.getExamineTag() == 5)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept + ""));
break;
}
}
@@ -305,15 +311,15 @@
@Override
public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
//娌℃湁鏍囩榛樿鍏ㄥ
- if(CollectionUtils.isEmpty(exportDTO.getExamineTags())){
- exportDTO.setExamineTags(Arrays.asList(0,1,2));
+ if (CollectionUtils.isEmpty(exportDTO.getExamineTags())) {
+ exportDTO.setExamineTags(Arrays.asList(0, 1, 2));
}
/** 瀵间笁寮爏heet */
//杞﹁締
List<CheckIndexCar> checkIndexCars = new ArrayList<>();
//杞﹁締鍜屼汉鑴告病鏈夊叕瀹夐儴
for (Integer examineTag : exportDTO.getExamineTags()) {
- if(examineTag ==2) continue;
+ if (examineTag == 2) continue;
CheckIndexCar checkIndexCar = new CheckIndexCar();
// checkIndexCar.setDate(date);
checkIndexCar.setQuarter(exportDTO.getQuarter());
@@ -322,9 +328,7 @@
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexCar);
checkIndexCar.setExamineTag(Short.valueOf(examineTag + ""));
- if (examineTag == 0) {
- checkIndexCar.setProvinceTag(Boolean.TRUE);
- }
+
checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar));
}
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -363,7 +367,7 @@
//浜鸿劯
List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
for (Integer examineTag : exportDTO.getExamineTags()) {
- if(examineTag ==2) continue;
+ if (examineTag == 2) continue;
CheckIndexFace checkIndexFace = new CheckIndexFace();
// checkIndexFace.setDate(date);
checkIndexFace.setQuarter(exportDTO.getQuarter());
@@ -372,9 +376,6 @@
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexFace);
checkIndexFace.setExamineTag(Short.valueOf(examineTag + ""));
- if (examineTag == 0) {
- checkIndexFace.setProvinceTag(Boolean.TRUE);
- }
checkIndexFaces.addAll(indexFaceService.selectCheckIndexFaceList(checkIndexFace));
}
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -421,12 +422,6 @@
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexVideo);
checkIndexVideo.setExamineTag(Short.valueOf(examineTag + ""));
- if (examineTag == 0) {
- checkIndexVideo.setProvinceTag(Boolean.TRUE);
- }else if(examineTag ==2){
- //鍙湁瑙嗛鏈夊叕瀹夐儴鏁版嵁
- checkIndexVideo.setDeptTag(Boolean.TRUE);
- }
checkIndexVideos.addAll(indexVideoService.selectCheckIndexVideoList(checkIndexVideo));
}
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -551,13 +546,21 @@
Map<String, Map<String, Object>> resultMap = new HashMap<>();
for (AreaDeptEnum value : AreaDeptEnum.values()) {
Map<String, Object> map = new HashMap<>();
- map.put("score", 0);
+ map.put("video", 0);
+ map.put("car", 0);
+ map.put("face", 0);
resultMap.put(value.getName(), map);
}
//濉厖鍚勪釜鍖哄幙鏁版嵁
for (CheckScore checkScore : dashboard) {
- Map<String, Object> map = new HashMap<>();
- map.put("score", checkScore.getScore().setScale(1,RoundingMode.HALF_UP));
+ Map<String, Object> map = resultMap.get(checkScore.getDeptName());
+ if (CheckConstants.Rule_Category_Video.equals(checkScore.getExamineCategory())) {
+ map.put("video", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ } else if (CheckConstants.Rule_Category_Car.equals(checkScore.getExamineCategory())) {
+ map.put("car", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ } else if (CheckConstants.Rule_Category_Face.equals(checkScore.getExamineCategory())) {
+ map.put("face", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ }
resultMap.put(checkScore.getDeptName(), map);
}
return resultMap;
--
Gitblit v1.8.0