From a6f066a148a80987ce47fee73246976afe7b60f3 Mon Sep 17 00:00:00 2001 From: zhaoxinyu Date: Mon, 23 Sep 2024 16:29:00 +0800 Subject: [PATCH] fix bug --- .../MTrainEducationController.java | 14 ++++- .../TrainEduStatisticsVideoController.java | 5 +- .../trainEducation/models/TrainEduVideo.java | 12 ++++ .../mobile/trainEducation/videoPage.html | 60 ++++++++++--------- .../views/platform/trainEdu/video.html | 27 ++++++++- 5 files changed, 83 insertions(+), 35 deletions(-) diff --git a/src/main/java/io/v/nutz/mobile/trainEducation/MTrainEducationController.java b/src/main/java/io/v/nutz/mobile/trainEducation/MTrainEducationController.java index 2ada83c..13e091c 100644 --- a/src/main/java/io/v/nutz/mobile/trainEducation/MTrainEducationController.java +++ b/src/main/java/io/v/nutz/mobile/trainEducation/MTrainEducationController.java @@ -75,7 +75,9 @@ public class MTrainEducationController { """); Cnd cnd = Cnd.NEW(); cnd.and("tea.disabled", "=", 0); - cnd.and(new Static("tea.id = (select albumId from train_edu_video order by createdAt desc LIMIT 0,1)")); +// cnd.and(new Static("tea.id = (select albumId from train_edu_video order by createdAt desc LIMIT 0,1)")); + cnd.and(new Static("CURDATE() >= tev.startDate")); + cnd.and(new Static("CURDATE() <= tev.endDate")); sql.setCondition(cnd); sql.setCallback(Sqls.callback.map()); dao.execute(sql); @@ -108,8 +110,10 @@ public class MTrainEducationController { $condition """); Cnd cnd = Cnd.NEW(); - cnd.and("tea.disabled","=",0); + cnd.and("tea.disabled", "=", 0); cnd.andEX("tea.typeId", "=", typeId); + cnd.and(new Static("CURDATE() >= tev.startDate")); + cnd.and(new Static("CURDATE() <= tev.endDate")); cnd.groupBy("tea.id"); sql.setCondition(cnd); return baseService.listPageMap(pageNumber, pageSize, sql); @@ -234,7 +238,9 @@ public class MTrainEducationController { @At @ViReturn @RequiresAuthentication - public Object getMyWatchRecord(@Param(value = "albumId", required = false) String albumId) { + public Object getMyWatchRecord(@Param(value = "albumId") String albumId) { + TrainEduVideo video = dao.fetch(TrainEduVideo.class, Cnd.where("albumId", "=", albumId)); + Sql sql = Sqls.create(""" SELECT tevwr.* @@ -245,6 +251,8 @@ public class MTrainEducationController { Cnd cnd = Cnd.NEW(); cnd.andEX("tevwr.albumId", "=", albumId); cnd.andEX("tevwr.userId", "=", ShiroUtil.getPrincipalProperty("id")); + cnd.and("tevwr.watchTime", ">=", video.getStartDate()); + cnd.and("tevwr.watchTime", "<=", video.getEndDate()); sql.setCondition(cnd); return baseService.listMap(sql); } diff --git a/src/main/java/io/v/nutz/trainEducation/controller/statistics/TrainEduStatisticsVideoController.java b/src/main/java/io/v/nutz/trainEducation/controller/statistics/TrainEduStatisticsVideoController.java index d8d9aee..1abbe79 100644 --- a/src/main/java/io/v/nutz/trainEducation/controller/statistics/TrainEduStatisticsVideoController.java +++ b/src/main/java/io/v/nutz/trainEducation/controller/statistics/TrainEduStatisticsVideoController.java @@ -100,6 +100,8 @@ public class TrainEduStatisticsVideoController { Cnd cnd = Cnd.NEW(); cnd.and("tevwr.albumId", "=", albumId); cnd.and(new Static("IF(tea.createType = 1, u.unionId = tea.unionId , 1=1)")); + cnd.and(new Static("tevwr.watchTime >= tev.startDate")); + cnd.and(new Static("tevwr.watchTime <= tev.endDate")); cnd.groupBy("tevwr.userId"); sql.setCondition(cnd); Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); @@ -175,11 +177,12 @@ public class TrainEduStatisticsVideoController { Cnd cnd = Cnd.NEW(); cnd.and("tevwr.albumId", "=", albumId); cnd.and(new Static("IF(tea.createType = 1, u.unionId = tea.unionId , 1=1)")); + cnd.and(new Static("tevwr.watchTime >= tev.startDate")); + cnd.and(new Static("tevwr.watchTime <= tev.endDate")); cnd.groupBy("tevwr.userId"); sql.setCondition(cnd); List list = baseService.listMap(sql); - List excelExportEntities = new ArrayList<>(); excelExportEntities.add(new ExcelExportEntity("序号","no",10)); excelExportEntities.add(new ExcelExportEntity("姓名","username",20)); diff --git a/src/main/java/io/v/nutz/trainEducation/models/TrainEduVideo.java b/src/main/java/io/v/nutz/trainEducation/models/TrainEduVideo.java index ce85c1a..f73fd48 100644 --- a/src/main/java/io/v/nutz/trainEducation/models/TrainEduVideo.java +++ b/src/main/java/io/v/nutz/trainEducation/models/TrainEduVideo.java @@ -6,6 +6,8 @@ import lombok.EqualsAndHashCode; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; +import java.util.Date; + @EqualsAndHashCode(callSuper = true) @Table @Data @@ -70,4 +72,14 @@ public class TrainEduVideo extends BaseModel { @ColDefine(type = ColType.INT) private Integer qualifiedNum; + @Column + @Comment("开始时间") + @ColDefine(type = ColType.DATE) + private Date startDate; + + @Column + @Comment("结束时间") + @ColDefine(type = ColType.DATE) + private Date endDate; + } diff --git a/src/main/resources/views/mobile/trainEducation/videoPage.html b/src/main/resources/views/mobile/trainEducation/videoPage.html index e9d18c6..f2fb715 100644 --- a/src/main/resources/views/mobile/trainEducation/videoPage.html +++ b/src/main/resources/views/mobile/trainEducation/videoPage.html @@ -99,34 +99,34 @@ layout("/mobile/platform.html"){ webkit-playsinline> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -353,7 +353,9 @@ layout("/mobile/platform.html"){ // }) // }, async getMyWatchRecord() { - const {data} = await $.get('/mobile/trainEducation/getMyWatchRecord') + const {data} = await $.get('/mobile/trainEducation/getMyWatchRecord', { + albumId: this.albumId + }) this.watchRecordList = data }, getWatchStatus(video) { diff --git a/src/main/resources/views/platform/trainEdu/video.html b/src/main/resources/views/platform/trainEdu/video.html index 38e4a5f..b680e7b 100644 --- a/src/main/resources/views/platform/trainEdu/video.html +++ b/src/main/resources/views/platform/trainEdu/video.html @@ -144,6 +144,26 @@ layout("/layouts/platform.html"){ + + + + + + + + + +