1

src/main/java/com/sztzjy/money_management/controller/GradeController.java

@@ -383,7 +383,7 @@ public class GradeController {
             criteria.andClassIdEqualTo(classId);
         }
 //        scoreRankExample.setOrderByClause("khal_score+zhgh_score+llkh_score desc");
-        scoreRankExample.setOrderByClause("totalRank desc");
+        scoreRankExample.setOrderByClause("total_rank asc");
         List<ScoreRank> scoreRankList = scoreRankMapper.selectByExample(scoreRankExample);
         //查询成绩总览权重
         TotalWeight totalWeight = totalWeightMapper.selectByPrimaryKey(schoolId);
@@ -477,7 +477,7 @@ public class GradeController {
         if (StringUtils.isNotBlank(classId)) {
             criteria.andClassIdEqualTo(classId);
         }
-        scoreRankExample.setOrderByClause("khal_rank desc");
+        scoreRankExample.setOrderByClause("khal_rank asc");
         List<ScoreRank> scoreRankList = scoreRankMapper.selectByExample(scoreRankExample);
 
         //设置总成绩
@@ -656,7 +656,7 @@ public class GradeController {
         if (StringUtils.isNotBlank(classId)) {
             criteria.andClassIdEqualTo(classId);
         }
-        scoreRankExample.setOrderByClause("zhgh_rank");
+        scoreRankExample.setOrderByClause("zhgh_rank asc");
         List<ScoreRank> scoreRankList = scoreRankMapper.selectByExample(scoreRankExample);
 
         //设置总成绩

src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java

@@ -282,6 +282,8 @@ public class SynthesisPlanController {
         PageHelper.startPage(index, size);
         SynthesisPlanScoreExample example = new SynthesisPlanScoreExample();
         example.createCriteria().andCaseidEqualTo(caseId).andUseridEqualTo(userId);
+        example.setOrderByClause("FIELD(manage_money_matters_type,'客户信息','风险测评-风险指标','财务分析-资产负债表','财务分析-收支储蓄表','财务分析-现金流量表','财务分析-财务比例分析','现金规划','生涯规划-教育规划'," +
+                "'生涯规划-消费规划','生涯规划-创业规划','生涯规划-退休规划','生涯规划-保险规划','投资规划','税务筹划','财产分配','财产传承')");
         List<SynthesisPlanScoreWithBLOBs> synthesisPlanScores = synthesisPlanScoreMapper.selectByExampleWithBLOBs(example);
         PageInfo<SynthesisPlanScoreWithBLOBs> pageInfo = new PageInfo<>(synthesisPlanScores);
         SynthesisPlanScoreDto synthesisPlanScoreDto = new SynthesisPlanScoreDto();

src/main/java/com/sztzjy/money_management/service/impl/TrainingServiceImpl.java

@@ -114,9 +114,9 @@ public class TrainingServiceImpl implements TrainingService {
         StudentScoreWeight studentScoreWeight = new StudentScoreWeight();
         //计分规则
         studentScoreWeight.setSummaryOfKnowledgeScore(BigDecimal.valueOf(20));
-        studentScoreWeight.setResourceLearningScore(BigDecimal.valueOf(2));
+        studentScoreWeight.setResourceLearningScore(BigDecimal.valueOf(20));
         studentScoreWeight.setLearningAssessmentScore(BigDecimal.valueOf(10));
-        studentScoreWeight.setExperimentalTrainingScore(BigDecimal.valueOf(20));
+        studentScoreWeight.setExperimentalTrainingScore(BigDecimal.valueOf(10));
 
         //权重
         studentScoreWeight.setSummaryOfKnowledgeWeight(BigDecimal.valueOf(0.2));