zouxuan 1 vuosi sitten
vanhempi
commit
0c557215a3

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CloudTeacherSumDto.java

@@ -40,7 +40,7 @@ public class CloudTeacherSumDto {
     private BigDecimal train0 = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "10~60分钟")
-    private Integer train1;
+    private BigDecimal train1 = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "60~120分钟")
     private Integer train2;
@@ -138,11 +138,11 @@ public class CloudTeacherSumDto {
         this.train0 = train0;
     }
 
-    public Integer getTrain1() {
+    public BigDecimal getTrain1() {
         return train1;
     }
 
-    public void setTrain1(Integer train1) {
+    public void setTrain1(BigDecimal train1) {
         this.train1 = train1;
     }
 

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -1269,7 +1269,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             }
             if(dto.getTrainStudentNum().compareTo(BigDecimal.ZERO) > 0){
                 dto.setTrainAvgTrainTime(dto.getTrainTotalTime().divide(dto.getTrainStudentNum(),2, 2));
-                dto.setTrainStandRate(dto.getTrain0().divide(dto.getTrainStudentNum(),4, 2).multiply(decimal).setScale(2));
+                dto.setTrainStandRate(dto.getTrain1().divide(dto.getTrainStudentNum(),4, 2).multiply(decimal).setScale(2));
             }
 
 
@@ -1301,7 +1301,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                 }
                 if(dto.getTrainStudentNum().compareTo(BigDecimal.ZERO) > 0){
                     dto.setTrainAvgTrainTime(dto.getTrainTotalTime().divide(dto.getTrainStudentNum(),2, 2));
-                    dto.setTrainStandRate(dto.getTrain0().divide(dto.getTrainStudentNum(),4, 2).multiply(decimal).setScale(2));
+                    dto.setTrainStandRate(dto.getTrain1().divide(dto.getTrainStudentNum(),4, 2).multiply(decimal).setScale(2));
                 }
             }
         }