From d268f82d25c25ebdc7a1ea30614f6cda6d3a9ae3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 10 十月 2024 16:31:41 +0800
Subject: [PATCH] win库+大屏考核指标查询bug

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java |   83 +++++++++++++++++++++++++++--------------
 1 files changed, 54 insertions(+), 29 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 e8012fe..cca9a63 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
@@ -3,6 +3,7 @@
 import annotation.DataScope;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.platform.base.CheckIndex;
 import com.ycl.platform.domain.dto.CheckResultExportDTO;
@@ -12,10 +13,7 @@
 import com.ycl.platform.domain.entity.*;
 import com.ycl.platform.domain.query.DashboardQuery;
 import com.ycl.platform.domain.vo.*;
-import com.ycl.platform.mapper.CheckRuleMapper;
-import com.ycl.platform.mapper.CheckScoreMapper;
-import com.ycl.platform.mapper.CheckTemplateMapper;
-import com.ycl.platform.mapper.CheckTemplateRuleMapper;
+import com.ycl.platform.mapper.*;
 import com.ycl.platform.service.ICheckIndexCarService;
 import com.ycl.platform.service.ICheckIndexFaceService;
 import com.ycl.platform.service.ICheckIndexVideoService;
@@ -28,6 +26,7 @@
 import com.ycl.utils.SecurityUtils;
 import com.ycl.utils.StringUtils;
 import constant.CheckConstants;
+import enumeration.general.AreaDeptEnum;
 import enumeration.general.PublishType;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +40,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -72,7 +72,8 @@
     private ICheckIndexVideoService indexVideoService;
     @Autowired
     private ISysDeptService deptService;
-
+    @Autowired
+    private PlatformMapper platformMapper;
 
     /**
      * 鏌ヨ鑰冩牳绉垎鎸囨爣
@@ -180,17 +181,22 @@
     }
 
     private void getCheckScore(CheckScore checkScore, Calendar calendar) {
-        // 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛e害 3 甯傚眬瀛e害
+        // 0.鐪佸巺鏈堝害 1.鐪佸巺瀛e害 2.甯傚眬鏈堝害 3.甯傚眬瀛e害 4.鍏畨閮ㄦ湀搴� 5.鍏畨閮ㄥ搴�
         switch (checkScore.getExamineTag()) {
-            case 0, 1:
+            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+""));
                 break;
-            case 2, 3:
+            case 1, 3, 5:
                 checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime());
                 checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime());
-                checkScore.setExamineTag(checkScore.getExamineTag() == 2 ? 0 : 1);
+                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;
         }
     }
@@ -319,10 +325,16 @@
         checkIndexCar.setQuarter(exportDTO.getQuarter());
         checkIndexCar.setDeptId(exportDTO.getDeptId());
         checkIndexCar.setDeptIds(exportDTO.getDeptIds());
-        checkIndexCar.setExamineTags(exportDTO.getExamineTags());
         //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
         roleControl(checkIndexCar);
-        List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
+        List<CheckIndexCar> checkIndexCars = new ArrayList<>();
+        for (Integer examineTag : exportDTO.getExamineTags()) {
+            checkIndexCar.setExamineTag(Short.valueOf(examineTag + ""));
+            if (examineTag == 0) {
+                checkIndexCar.setExamineTagQuery(1);
+            }
+            checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar));
+        }
         //璁$畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
         if (exportDTO.getAverage() != null && exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexCars)) {
             //鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
@@ -361,10 +373,16 @@
         checkIndexFace.setQuarter(exportDTO.getQuarter());
         checkIndexFace.setDeptId(exportDTO.getDeptId());
         checkIndexFace.setDeptIds(exportDTO.getDeptIds());
-        checkIndexFace.setExamineTags(exportDTO.getExamineTags());
         //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
         roleControl(checkIndexFace);
-        List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
+        List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
+        for (Integer examineTag : exportDTO.getExamineTags()) {
+            checkIndexFace.setExamineTag(Short.valueOf(examineTag + ""));
+            if (examineTag == 0) {
+                checkIndexFace.setExamineTagQuery(1);
+            }
+            checkIndexFaces.addAll(indexFaceService.selectCheckIndexFaceList(checkIndexFace));
+        }
         //璁$畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
         if (exportDTO.getAverage() != null && exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexFaces)) {
             //鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
@@ -403,10 +421,16 @@
         checkIndexVideo.setQuarter(exportDTO.getQuarter());
         checkIndexVideo.setDeptId(exportDTO.getDeptId());
         checkIndexVideo.setDeptIds(exportDTO.getDeptIds());
-        checkIndexVideo.setExamineTags(exportDTO.getExamineTags());
         //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
         roleControl(checkIndexVideo);
-        List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
+        List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
+        for (Integer examineTag : exportDTO.getExamineTags()) {
+            checkIndexVideo.setExamineTag(Short.valueOf(examineTag + ""));
+            if (examineTag == 0) {
+                checkIndexVideo.setExamineTagQuery(1);
+            }
+            checkIndexVideos.addAll(indexVideoService.selectCheckIndexVideoList(checkIndexVideo));
+        }
         //璁$畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
         if (exportDTO.getAverage() != null && exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexVideos)) {
             //鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
@@ -509,22 +533,23 @@
 
     //澶у睆灞曠ず鑰冩牳寰楀垎
     @Override
-    //TODO:鑰冭檻limit bug
-    public Map<String, List<Map<String, Object>>> dashboard(DashboardQuery dashboardQuery) {
+    public Map<String, Map<String, Object>> dashboard(DashboardQuery dashboardQuery) {
+        Date now = new Date();
+        dashboardQuery.setStartTime(DateUtils.getMouthStart(now));
+        dashboardQuery.setEndTime(DateUtils.getMouthEnd(now));
         List<CheckScore> dashboard = scoreMapper.dashboard(dashboardQuery);
-        Map<String, List<Map<String, Object>>> resultMap = new HashMap<>();
-
-        for (CheckScore checkScore : dashboard) {
-            List<Map<String, Object>> list = new ArrayList<>();
+        //鍒濆鍖栧悇涓尯鍘挎暟鎹�
+        Map<String, Map<String, Object>> resultMap = new HashMap<>();
+        for (AreaDeptEnum value : AreaDeptEnum.values()) {
             Map<String, Object> map = new HashMap<>();
-            map.put("value",checkScore.getScore());
-            if(dashboardQuery.getDataScope() ==1) {
-                map.put("name", "鐪佸巺寰楀垎");
-            }else {
-                map.put("name", "鍖哄幙寰楀垎");
-            }
-            list.add(map);
-            resultMap.put(checkScore.getDeptName(),list );
+            map.put("score", 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));
+            resultMap.put(checkScore.getDeptName(), map);
         }
         return resultMap;
     }

--
Gitblit v1.8.0