修复排序 评分分数计算有误的问题

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

@@ -323,24 +323,35 @@ public class CaseController {
     @PostMapping("countLearnTime")
     @ApiOperation("统计实训学习时长")
     @AnonymousAccess
-    public void countLearnTime(@RequestParam String trainingId,
+    public void countLearnTime(@RequestParam(required = false) String trainingId,
                                @ApiParam("时间，单位分钟") BigDecimal minuter) {
+        if(trainingId==null){
+            return;
+        }
         StuTrainingWithBLOBs stuTrainingWithBLOBs = stuTrainingMapper.selectByPrimaryKey(trainingId);
-        if (stuTrainingWithBLOBs.getTrainingTime() == null) {
-            stuTrainingWithBLOBs.setTrainingTime(minuter);
-        } else {
-            stuTrainingWithBLOBs.setTrainingTime(stuTrainingWithBLOBs.getTrainingTime().add(minuter));
+        if(stuTrainingWithBLOBs!=null){
+            if (stuTrainingWithBLOBs.getTrainingTime()==null){
+                stuTrainingWithBLOBs.setTrainingTime(minuter);
+            }else {
+                stuTrainingWithBLOBs.setTrainingTime(stuTrainingWithBLOBs.getTrainingTime().add(minuter));
+            }
+            stuTrainingMapper.updateByPrimaryKeyWithBLOBs(stuTrainingWithBLOBs);
         }
-        stuTrainingMapper.updateByPrimaryKeyWithBLOBs(stuTrainingWithBLOBs);
     }
 
     @PostMapping("countCaseTime")
     @ApiOperation("统计综合规划编辑建议书时间")
     @AnonymousAccess
-    public void countCaseTime(@RequestParam String stuClientId,
-                              @ApiParam("时间，单位分钟") BigDecimal minuter) {
+    public void countCaseTime(@RequestParam(required = false) String stuClientId,
+                               @ApiParam("时间，单位分钟") BigDecimal minuter) {
+        if(stuClientId==null){
+            return;
+        }
         SynthesisPlanClient synthesisPlanClient = synthesisPlanClientMapper.selectByPrimaryKey(stuClientId);
-        if (synthesisPlanClient.getSubmitStatus().equals("已审核") || synthesisPlanClient.getSubmitStatus().equals("未审核")) {
+        if(synthesisPlanClient==null){
+            return;
+        }
+        if (synthesisPlanClient.getSubmitStatus().equals("已审核")||synthesisPlanClient.getSubmitStatus().equals("未审核")){
             return;
         } else {
             if (synthesisPlanClient.getUseTime() == null) {

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

@@ -718,6 +718,9 @@ public class GradeController {
             Map<String, ObjCaseScoreVo> map = new HashMap<>();
             for (int i = 0; i < synthesisPlanScores.size(); i++) {
                 SynthesisPlanScore synthesisPlanScore = synthesisPlanScores.get(i);
+                if(synthesisPlanScore.getTestCenter().contains("分析") || synthesisPlanScore.getTestCenter().contains("理财方案")){
+                    continue;
+                }
                 if (map.containsKey(synthesisPlanScore.getManageMoneyMattersType())) {
                     ObjCaseScoreVo objCaseScoreVo = map.get(synthesisPlanScore.getManageMoneyMattersType());
                     objCaseScoreVo.setStandardScore(objCaseScoreVo.getStandardScore().add(BigDecimal.valueOf(2)));

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.math.BigDecimal;
 import java.util.List;
 
 @RestController
@@ -107,6 +108,10 @@ public class ProductCenter {
         }
         example.setOrderByClause("code_id asc");
         List<p2pData> p2pData = p2pDataMapper.selectByExample(example);
+        for (int i = 0; i < p2pData.size(); i++) {
+            p2pData.get(i).setAnnualReturn(String.valueOf(BigDecimal.valueOf(Double.parseDouble(p2pData.get(i).getAnnualReturn())).setScale(2,BigDecimal.ROUND_HALF_UP)));
+            p2pData.get(i).setPeratio(String.valueOf(BigDecimal.valueOf(Double.parseDouble(p2pData.get(i).getPeratio())).setScale(2,BigDecimal.ROUND_HALF_UP)));
+        }
         PageInfo<p2pData> pageInfo = new PageInfo<>(p2pData);
         return new ResultEntity<>(HttpStatus.OK, "P2P产品查询成功！", pageInfo);
     }

src/main/java/com/sztzjy/money_management/controller/common/StatisticsController.java

@@ -170,7 +170,7 @@ public class StatisticsController {
     @AnonymousAccess
     @GetMapping("/getTeaTrainingScoreAnalysis")
     @ApiOperation("老师端 -班级成绩统计分析")
-    public TeaClassScoreDto getTeaTrainingScoreAnalysis(String schoolId, String classId, Date time) {
+    public TeaClassScoreDto getTeaTrainingScoreAnalysis(@RequestParam String schoolId,@RequestParam(required = false) String classId,@RequestParam Date time) {
         ScoreRankExample scoreExample = new ScoreRankExample();
         ScoreRankExample.Criteria criteria = scoreExample.createCriteria();
         // 将Date对象转换为指定格式的字符串

src/main/java/com/sztzjy/money_management/entity/dto/StuSynthesisPlanScoreDto.java

@@ -9,7 +9,6 @@ import java.math.BigDecimal;
 @Data
 @NoArgsConstructor
 public class StuSynthesisPlanScoreDto {
-
     @ApiModelProperty("学习项目")
     private String name;
 

src/main/java/com/sztzjy/money_management/entity/vo/ObjCaseScoreVo.java

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 
 @Data
 public class ObjCaseScoreVo {
-    @ApiModelProperty("标准分")
+    @ApiModelProperty("客观题标准分")
     private BigDecimal StandardScore;
 
     @ApiModelProperty("学生得分")

src/main/resources/mapper/ScoreRankMapper.xml

@@ -606,6 +606,7 @@
     from score_rank s
     where school_id = #{schoolId,jdbcType=VARCHAR} and class_name=#{className,jdbcType=VARCHAR}
     group BY update_date
+    order by update_date asc
     LIMIT 5
   </select>