caozixuan 1 год назад
Родитель
Сommit
7a67e6f8cc

+ 11 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CourseWeightDto.java

@@ -30,6 +30,9 @@ public class CourseWeightDto {
     @ApiModelProperty("目标整体权重")
     private BigDecimal totalWeight;
 
+    @ApiModelProperty("目标分值统计")
+    private BigDecimal totalScore;
+
     @ApiModelProperty("评价方式权重详情")
     private List<CourseWeightDetailDto> evaluationList;
 
@@ -73,6 +76,14 @@ public class CourseWeightDto {
         this.totalWeight = totalWeight;
     }
 
+    public BigDecimal getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(BigDecimal totalScore) {
+        this.totalScore = totalScore;
+    }
+
     public List<CourseWeightDetailDto> getEvaluationList() {
         return evaluationList;
     }

+ 5 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/CourseWeightServiceImpl.java

@@ -78,6 +78,7 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
                 List<CourseDimensionDto> dimensionList = courseTarget.getDimensionList();
                 String degreeRequirement = courseTarget.getDegreeRequirement();
                 BigDecimal totalWeight = courseTarget.getTotalWeight();
+                BigDecimal totalScore = new BigDecimal(0);
 
                 List<CourseWeightDetailDto> courseWeightDetailDtoList = new ArrayList<>();
                 for (CourseEvaluationResult courseEvaluationResult : courseEvaluationResultList) {
@@ -101,6 +102,9 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
                     detail.setEnable(enable);
                     detail.setWeight(weight);
                     detail.setTargetScore(targetScore);
+                    if (enable){
+                        totalScore = totalScore.add(targetScore);
+                    }
                     courseWeightDetailDtoList.add(detail);
                 }
 
@@ -110,6 +114,7 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
                 courseWeightDto.setDimensionList(dimensionList);
                 courseWeightDto.setDegreeRequirement(degreeRequirement);
                 courseWeightDto.setTotalWeight(totalWeight);
+                courseWeightDto.setTotalScore(totalScore);
                 courseWeightDto.setEvaluationList(courseWeightDetailDtoList);
                 result.add(courseWeightDto);
             }