update from server

src/main/java/io/v/nutz/trainEducation/controller/statistics/TrainEduStatisticsVideoController.java

@@ -74,15 +74,17 @@ public class TrainEduStatisticsVideoController {
                 	u.loginname,
                 	u.unitname,
                 	u.unionname,
+                	tev.qualifiedNum,
                 	(
                 	SELECT
-                 		SUM(IF( cnt > 2, 2, cnt )) AS count
+                 		SUM(IF( cnt > tev.everyDayMaxWatchNum, tev.everyDayMaxWatchNum, cnt )) AS count
                  	FROM
                  		( SELECT watchTime, COUNT( 1 ) AS cnt FROM train_edu_video_watch_record where userId = tevwr.userId and albumId = tevwr.albumId GROUP BY watchTime ) AS subquery
                     ) as watchCount
                 	
                 FROM
                 	`train_edu_video_watch_record` tevwr
+                	LEFT JOIN train_edu_video tev ON tev.id = tevwr.videoId
                 	LEFT JOIN train_edu_album tea on tea.id = tevwr.albumId
                 	LEFT JOIN `user` u ON u.id = tevwr.userId
                 $condition

src/main/java/io/v/nutz/trainEducation/models/TrainEduVideo.java

@@ -65,4 +65,9 @@ public class TrainEduVideo extends BaseModel {
     @ColDefine(type = ColType.INT)
     private Integer everyDayMaxWatchNum;
 
+    @Column
+    @Comment("合格/达标次数")
+    @ColDefine(type = ColType.INT)
+    private Integer qualifiedNum;
+
 }