From 2e8178720717bd7d3865ed2493f9cab324f961cf Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Wed, 27 Mar 2024 14:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E5=8A=A1=E8=AE=A4?= =?UTF-8?q?=E7=9F=A5=E5=BE=97=E5=88=86=E5=92=8C=E6=99=BA=E8=83=BD=E8=AF=84?= =?UTF-8?q?=E5=88=86=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund_investment/controller/TopicController.java | 1 + .../serviceImpl/tea/ClassScoreServiceImpl.java | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java b/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java index dfb0618..3d7c3c4 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/TopicController.java @@ -155,6 +155,7 @@ public class TopicController { if (time >= 120) { score = BigDecimal.valueOf(5); performanceScore.setPracticalCognitionScore(score); + performanceScore.setTotalScore(score); } else { performanceScore.setPracticalCognitionScore(BigDecimal.ZERO); } diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java index 2a4455e..c7b1dfa 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java @@ -365,22 +365,20 @@ public class ClassScoreServiceImpl implements ClassScoreService { } for (String flowIdByList : list) { TrainingReportExample trainingReportExample = new TrainingReportExample(); - trainingReportExample.createCriteria().andSchoolIdEqualTo(schoolId).andFlowIdEqualTo(flowIdByList); + trainingReportExample.createCriteria().andSchoolIdEqualTo(schoolId).andFlowIdEqualTo(flowIdByList).andStepEqualTo("投资报告"); PerformanceScore scoreByFlowId = performanceScoreService.getByFlowId(flowIdByList); - List trainingReports = trainingReportMapper.selectByExample(trainingReportExample); + List trainingReports = trainingReportMapper.selectByExampleWithBLOBs(trainingReportExample); if (trainingReports.isEmpty()) { continue; } - String experience = ""; TrainingReport trainingReport = trainingReports.get(0); - if (trainingReport.getExperience() == null) { + if (scoreByFlowId.getExperienceScore() == null && StringUtils.isBlank(trainingReport.getExperience())) { performanceScoreService.updateScore("experienceScore", 0, flowIdByList); trainingReport.setExperienceScore(BigDecimal.ZERO); - } else { - experience = trainingReport.getExperience(); } //实训心得 - if (scoreByFlowId.getExperienceScore() == null) { + if (scoreByFlowId.getExperienceScore() == null && StringUtils.isNotBlank(trainingReport.getExperience())) { + String experience = trainingReport.getExperience(); if (experience.length() < 100) { performanceScoreService.updateScore("experienceScore", 1, flowIdByList); trainingReport.setExperienceScore(BigDecimal.ONE); @@ -417,6 +415,7 @@ public class ClassScoreServiceImpl implements ClassScoreService { System.out.println(length); } + /* 用户成绩详情展示 * @author xcj * @Date 2023/11/29