From ae9ede70c133e257baead8e36bc65063d5b5c3c9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 01 九月 2024 17:56:15 +0800
Subject: [PATCH] 系统优化+bug修复

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java |   47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 insertions(+), 2 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 c790715..cb241bd 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
@@ -1,6 +1,7 @@
 package com.ycl.platform.service.impl;
 
 import annotation.DataScope;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.platform.domain.dto.CheckScoreDTO;
 import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
@@ -98,7 +99,7 @@
                 .setDate(checkScoreIndexDTO.getDate())
                 .setQuarter(checkScoreIndexDTO.getQuarter());
         scoreIndexDTO.setParams(checkScoreIndexDTO.getParams());
-
+        scoreIndexDTO.setExamineTag(checkScore.getExamineTag());
         //鑾峰綋鏈堜唤
         if(StringUtils.isEmpty(scoreIndexDTO.getDate()) && CollectionUtils.isEmpty(checkScoreIndexDTO.getQuarter())){
             //濡傛灉鏌ヨ鏉′欢涓嶅惈鍙傛暟锛屾煡璇㈢Н鍒嗗搴斿垱寤烘椂闂�
@@ -133,8 +134,26 @@
 
         // 鑾峰彇鏁版嵁鏃ユ湡鏃堕棿
         Calendar calendar = Calendar.getInstance();
+        getCheckScore(checkScore, calendar);
+
         // 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
         if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); }
+
+        List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore);
+        // 濡傛灉鏁版嵁涓虹┖锛屽垯鏌ヨ涔嬪墠鐨勬暟鎹�
+        if (checkScores.isEmpty()) {
+            CheckScore one = new LambdaQueryChainWrapper<>(baseMapper).select(CheckScore::getCreateTime).last("order by create_time desc limit 1").one();
+            if (Objects.nonNull(one)) {
+                calendar.setTime(one.getCreateTime());
+                getCheckScore(checkScore, calendar);
+                checkScores = scoreMapper.selectCheckScoreMap(checkScore);
+            }
+        }
+        return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+    }
+
+    private void getCheckScore(CheckScore checkScore, Calendar calendar)
+    {
         // 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛ｅ害 3 甯傚眬瀛ｅ害
         switch (checkScore.getExamineTag()) {
             case 0, 1:
@@ -148,7 +167,6 @@
                 checkScore.setExamineTag(checkScore.getExamineTag() == 2 ? 0 : 1);
                 break;
         }
-        return scoreMapper.selectCheckScoreMap(checkScore).stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
     }
 
     /**
@@ -226,12 +244,14 @@
     @Override
     public void exportIndex(HttpServletResponse response,CheckScore checkScoreDTO) throws IOException {
         String date = checkScoreDTO.getDate();
+        Integer examineTag = null;
         //濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
         if(StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())){
             CheckScore checkScore = getById(checkScoreDTO.getId());
             Date createTime = checkScore.getCreateTime();
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
             date = formatter.format(createTime);
+            examineTag = checkScore.getExamineTag();
         }
 
         /** 瀵间笁寮爏heet */
@@ -239,18 +259,27 @@
         CheckIndexCar checkIndexCar = new CheckIndexCar();
         checkIndexCar.setDate(date);
         checkIndexCar.setQuarter(checkScoreDTO.getQuarter());
+        if(examineTag!=null) {
+            checkIndexCar.setExamineTag(Short.parseShort(examineTag + ""));
+        }
         List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
         ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁",checkIndexCars,CheckIndexCar.class);
         //浜鸿劯
         CheckIndexFace checkIndexFace = new CheckIndexFace();
         checkIndexFace.setDate(date);
         checkIndexFace.setQuarter(checkScoreDTO.getQuarter());
+        if(examineTag!=null) {
+            checkIndexFace.setExamineTag(Short.parseShort(examineTag + ""));
+        }
         List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
         ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁",checkIndexFaces,CheckIndexFace.class);
         //瑙嗛
         CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
         checkIndexVideo.setDate(date);
         checkIndexVideo.setQuarter(checkScoreDTO.getQuarter());
+        if(examineTag!=null) {
+            checkIndexVideo.setExamineTag(Short.parseShort(examineTag + ""));
+        }
         List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
         ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁",checkIndexVideos,CheckIndexVideo.class);
 
@@ -272,6 +301,20 @@
         }
     }
 
+    @Override
+    public List<Map<String, Object>> home() {
+        return baseMapper.home();
+    }
+
+
+    @Override
+    public List<Map<String, Object>> calculate(String category) {
+        Calendar calendar = Calendar.getInstance();
+        Date endDate = calendar.getTime();
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        Date startDate = calendar.getTime();
+        return scoreMapper.calculate(startDate, endDate, category);
+    }
 
     //    /**
 //     * 鏂板鑰冩牳绉垎

--
Gitblit v1.8.0