Merge branch 'master' of http://118.31.7.2:3000/tianzeOrg/fund_investment

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);
         }

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<TrainingReport> trainingReports = trainingReportMapper.selectByExample(trainingReportExample);
+                List<TrainingReport> 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