Merge branch 'feature/1219_opt' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/HomeServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
@@ -405,7 +406,7 @@ public class HomeServiceImpl implements HomeService {
                 && practiceSummary.getPracticeCount().compareTo(BigDecimal.ZERO) > 0
                 && practiceSummary.getTotalPracticeTime().compareTo(BigDecimal.ZERO) > 0){
             practiceSummary.setAveragePracticeTime(practiceSummary.getTotalPracticeTime()
-                    .divide(practiceSummary.getPracticeCount(), 0, BigDecimal.ROUND_HALF_UP));
+                    .divide(practiceSummary.getPracticeCount(), 0, RoundingMode.DOWN));
         }
         teacherPracticeHome.setPracticeSummary(practiceSummary);
 

toolset/utils/src/main/java/com/yonge/toolset/utils/date/DateUtil.java

@@ -1324,7 +1324,14 @@ public class DateUtil {
 		long hour = totalPracticeTime / 3600;
 		long minute = (totalPracticeTime % 3600) / 60;
 		long second = totalPracticeTime % 60;
-		return hour + "小时" + minute + "分钟" + second + "秒";
+		// 优化显示
+		if (hour > 0) {
+			return hour + "小时" + minute + "分钟";
+		} else if (minute > 0) {
+			return minute + "分钟" + second + "秒";
+		} else {
+			return second + "秒";
+		}
 	}
 
 	/**