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 |  118 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 86 insertions(+), 32 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 8f6ab0a..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;
@@ -10,11 +11,9 @@
 import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
 import com.ycl.platform.domain.dto.ScoreIndexDTO;
 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;
@@ -27,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;
@@ -40,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.*;
@@ -71,7 +72,8 @@
     private ICheckIndexVideoService indexVideoService;
     @Autowired
     private ISysDeptService deptService;
-
+    @Autowired
+    private PlatformMapper platformMapper;
 
     /**
      * 鏌ヨ鑰冩牳绉垎鎸囨爣
@@ -173,27 +175,34 @@
                 checkScores = scoreMapper.selectCheckScoreMap(checkScore);
             }
         }
+        //鍒嗘暟淇濈暀涓�浣嶅皬鏁�
+        checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
         return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
     }
 
     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;
         }
     }
 
     /**
-     * 鏌ヨ鑰冩牳绉垎鍗$墖鍒楄〃
+     * 鏌ヨ鑰冩牳绉垎鍗$墖鎶樼嚎鍥�
      *
      * @param checkScore 鑰冩牳绉垎
      * @return 鑰冩牳绉垎
@@ -217,6 +226,8 @@
             checkScore.setDate(date);
         }
         List<CheckScore> checkScores = scoreMapper.selectCheckScoreList(checkScore);
+        //鍒嗘暟淇濈暀涓�浣嶅皬鏁�
+        checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
         return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
     }
 
@@ -231,7 +242,9 @@
     public List<CheckScore> page(CheckScore checkScore) {
         //鍖哄幙鍙兘鐪嬪凡鍙戝竷
         roleControl(checkScore);
-        return scoreMapper.selectCheckScoreList(checkScore);
+        List<CheckScore> scoreList = scoreMapper.selectCheckScoreList(checkScore);
+        scoreList.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
+        return scoreList;
     }
 
     /**
@@ -291,31 +304,37 @@
      */
     @Override
     public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
-        String date = exportDTO.getDate();
+//        String date = exportDTO.getDate();
         //濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
-        if (StringUtils.isEmpty(exportDTO.getDate()) && CollectionUtils.isEmpty(exportDTO.getQuarter())) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
-            if (exportDTO.getId() != null) {
-                CheckScore checkScore = getById(exportDTO.getId());
-                Date createTime = checkScore.getCreateTime();
-                date = formatter.format(createTime);
-            } else {
-                //闃叉鍗$墖椤甸潰瀵煎嚭涓嶄紶scoreId锛屽鑷存姤閿�
-                date = formatter.format(new Date());
-            }
-        }
+//        if (StringUtils.isEmpty(exportDTO.getDate()) && CollectionUtils.isEmpty(exportDTO.getQuarter())) {
+//            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
+//            if (exportDTO.getId() != null) {
+//                CheckScore checkScore = getById(exportDTO.getId());
+//                Date createTime = checkScore.getCreateTime();
+//                date = formatter.format(createTime);
+//            } else {
+//                //闃叉鍗$墖椤甸潰瀵煎嚭涓嶄紶scoreId锛屽鑷存姤閿�
+//                date = formatter.format(new Date());
+//            }
+//        }
 
         /** 瀵间笁寮爏heet */
         //杞﹁締
         CheckIndexCar checkIndexCar = new CheckIndexCar();
-        checkIndexCar.setDate(date);
+//        checkIndexCar.setDate(date);
         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)) {
             //鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
@@ -350,14 +369,20 @@
         ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCarVOS, CheckIndexCarVO.class);
         //浜鸿劯
         CheckIndexFace checkIndexFace = new CheckIndexFace();
-        checkIndexFace.setDate(date);
+//        checkIndexFace.setDate(date);
         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)) {
             //鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
@@ -392,14 +417,20 @@
         ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaceVOS, CheckIndexFaceVO.class);
         //瑙嗛
         CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
-        checkIndexVideo.setDate(date);
+//        checkIndexVideo.setDate(date);
         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)) {
             //鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
@@ -500,6 +531,29 @@
         return scoreMapper.calculate(startDate, endDate, category);
     }
 
+    //澶у睆灞曠ず鑰冩牳寰楀垎
+    @Override
+    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, Map<String, Object>> resultMap = new HashMap<>();
+        for (AreaDeptEnum value : AreaDeptEnum.values()) {
+            Map<String, Object> map = new HashMap<>();
+            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