浏览代码

管乐迷需求一大堆

zouxuan 2 年之前
父节点
当前提交
c61d05fcf1

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

@@ -1305,9 +1305,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if(dto.getNormalNum().compareTo(BigDecimal.ZERO) == 0){
                 continue;
             }
-            dto.setAvgTrainTime(dto.getTrainTotalTime().divide(dto.getNormalNum(),2, BigDecimal.ROUND_DOWN).multiply(decimal));
-            dto.setTrainRate(dto.getTrainStudentNum().divide(dto.getNormalNum(),2, BigDecimal.ROUND_DOWN).multiply(decimal));
-            dto.setTrainStandRate(dto.getTrain0().divide(dto.getNormalNum(),2, BigDecimal.ROUND_DOWN).multiply(decimal));
+            BigDecimal normalNum = dto.getNormalNum();
+            dto.setAvgTrainTime(dto.getTrainTotalTime().divide(normalNum,2, BigDecimal.ROUND_DOWN));
+            dto.setTrainRate(dto.getTrainStudentNum().divide(normalNum,2, BigDecimal.ROUND_DOWN).multiply(decimal));
+            dto.setTrainStandRate(dto.getTrain0().divide(normalNum,2, BigDecimal.ROUND_DOWN).multiply(decimal));
         }
         return cloudTeacherSumDtos;
     }

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -1216,7 +1216,7 @@
         left join student_registration sr ON mg.id_ = sr.music_group_id_
         left join student s ON sr.user_id_ = s.user_id_
         left join (select smcr.user_id_,ROUND(SUM(smcr.play_time_)/60/#{queryInfo.weekBetween}) train_time_ from sys_music_compare_record smcr
-        where smcr.create_time_ between #{queryInfo.startDate} AND #{queryInfo.endDate}
+        where DATE_FORMAT(smcr.create_time_,'%Y-%m-%d') between #{queryInfo.startDate} AND #{queryInfo.endDate}
         group by smcr.user_id_) smcr ON s.user_id_ = smcr.user_id_
         left JOIN sys_user su ON su.id_ = sr.user_id_
         left join organization o ON o.id_ = su.organ_id_