From 045023133d111be97ad52f097b4b99a2cf5a8311 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 00:22:47 +0800
Subject: [PATCH] 考核结果导出优化2

---
 ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
index 12f0be7..b4c81a4 100644
--- a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -39,7 +40,6 @@
     @Autowired
     private ICheckIndexCarService carService;
 
-    //TODO锛氱粺涓�浠诲姟鏃堕棿
     public void executeTemplate(Integer templateId) {
         CheckTemplate checkTemplate = templateMapper.selectCheckTemplateById(templateId);
         if (checkTemplate != null) {
@@ -88,16 +88,16 @@
                     addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexFace, CheckConstants.Rule_Category_Face);
                 }
             }
-
             //鍌ㄥ瓨鍒嗘暟
-            scoreMapper.saveBatch(scoreList);
-            //TODO锛氭牴鎹姤璀﹀垎鏁伴槇鍊硷紝娣诲姞鎶ヨ淇℃伅
-
+            if(!CollectionUtils.isEmpty(scoreList)) {
+                scoreMapper.saveBatch(scoreList);
+            }
         }
     }
 
     private <T extends CheckIndex> void addToList(Integer templateId, CheckTemplate checkTemplate, Short examineTag, List<CheckTemplateRule> templateRuleList, List<CheckScore> scoreList, T indexObject, Short checkCategory) {
         CheckScore checkScore = new CheckScore();
+        checkScore.setIndexId(indexObject.getId());
         BigDecimal scoreFinal = BigDecimal.ZERO;
         for (CheckTemplateRule templateRule : templateRuleList) {
             //璁$畻鍒嗘暟
@@ -122,7 +122,7 @@
             BigDecimal score = index.multiply(templateRule.getWeight());
             scoreFinal = scoreFinal.add(score);
         } catch (Exception e) {
-            log.info("鍙嶅皠寮傚父", e);
+            log.info("鍙嶅皠寮傚父", e.getMessage());
         }
         return scoreFinal;
     }

--
Gitblit v1.8.0