diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskLogDao.java index 2c86bc17..c7003319 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskLogDao.java @@ -1,6 +1,7 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.StudentHandsOnTaskLog; +import com.ibeetl.jlw.web.query.HandsOnAchievementQuery; import com.ibeetl.jlw.web.query.StudentHandsOnTaskLogQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; @@ -29,4 +30,12 @@ public interface StudentHandsOnTaskLogDao extends BaseMapper getPracticalOperationParticipantsNumberValues(StudentHandsOnTaskLogQuery handsOnTaskLogQuery); } diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java index bbd5fac8..7c0131a3 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java @@ -183,4 +183,11 @@ public interface TeacherOpenCourseQuestionLogDao extends BaseMapper getChapterExerciseParticipantsValuesNumber(TeacherOpenCourseQuestionLogQuery pageQuery); } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java index 4a21af36..1a91dfd8 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java @@ -9,6 +9,7 @@ import org.beetl.sql.fetch.annotation.Fetch; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /* @@ -113,6 +114,9 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp //后台用户ID private Long userId ; + + //新增时间 + private Date addTime; public TeacherOpenCourseMergeCourseInfo(){ } @@ -367,6 +371,13 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp return (List)this.get("children"); } + public Date getAddTime() { + return addTime; + } + + public void setAddTime(Date addTime) { + this.addTime = addTime; + } @Override public int compareTo(TeacherOpenCourseMergeCourseInfo o) { diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java index 76dd4d90..d5913469 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java @@ -9,6 +9,7 @@ import org.beetl.sql.annotation.entity.AssignID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.util.Date; /* * 开课关联- 资源管理 @@ -65,6 +66,11 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{ //后台用户ID（上传人） @Dict(type = "core_user.name.1=1") private Long userId ; + + /** + * 新增时间 + */ + private Date addTime; public TeacherOpenCourseMergeResourcesInfo(){ } @@ -192,4 +198,12 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{ public void setResourcesInfoStatus(GlobalUpStatusEnum resourcesInfoStatus) { this.resourcesInfoStatus = resourcesInfoStatus; } + + public Date getAddTime() { + return addTime; + } + + public void setAddTime(Date addTime) { + this.addTime = addTime; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnAchievementService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnAchievementService.java index 9c6627ac..a8255409 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/HandsOnAchievementService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnAchievementService.java @@ -128,7 +128,7 @@ public class HandsOnAchievementService extends CoreBaseService schoolClasses = teacherOpenCourseMergeSchoolClassService.getValues(classQuery); data.put("classNum", schoolClasses.size()); //学生人数 TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery = new TeacherOpenCourseMergeStudentQuery(); teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseId(teacherOpenCourseId); + teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1); List studentList = teacherOpenCourseMergeStudentService.getValuesByQueryNotWithPermission(teacherOpenCourseMergeStudentQuery); data.put("studentNum", studentList.size()); //学习通过率 @@ -137,23 +142,36 @@ public class StatisticalAnalysisService { data.put("studentPassNum", 0); } //授课视频 - TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery(); - courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId); - courseInfoQuery.setCourseInfoStatus(1); - List courseInfos = teacherOpenCourseMergeCourseInfoService.getValuesByQueryNotWithPermission(courseInfoQuery); - List videoCount = courseInfos.stream().filter(v -> v.getCourseVideoId() != null).collect(Collectors.toList()); +// TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery(); +// courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId); +// courseInfoQuery.setCourseInfoStatus(1); +// List courseInfos = teacherOpenCourseMergeCourseInfoService.getValuesByQueryNotWithPermission(courseInfoQuery); +// List videoCount = courseInfos.stream().filter(v -> v.getCourseVideoId() != null).collect(Collectors.toList()); + TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery = new TeacherOpenCourseMergeResourcesInfoQuery(); + teacherOpenCourseMergeResourcesInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId); + teacherOpenCourseMergeResourcesInfoQuery.setResourcesInfoStatus(GlobalUpStatusEnum.UP); + teacherOpenCourseMergeResourcesInfoQuery.setStartTime(stime); + teacherOpenCourseMergeResourcesInfoQuery.setEndTime(etime); + List teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery); + List videoCount = teacherOpenCourseMergeResourcesInfo.stream().filter(v ->Objects.equals(v.getResourcesInfoType(),1)).collect(Collectors.toList()); data.put("teachingVideoNum", videoCount.size()); //非视频资源 - data.put("nonVideoResourcesNum", courseInfos.size() - videoCount.size()); + data.put("nonVideoResourcesNum", teacherOpenCourseMergeResourcesInfo.size() - videoCount.size()); + //课程公告 TeacherOpenCourseNoticeQuery teacherOpenCourseNoticeQuery = new TeacherOpenCourseNoticeQuery(); teacherOpenCourseNoticeQuery.setTeacherOpenCourseIds(teacherOpenCourseId.toString()); + teacherOpenCourseNoticeQuery.setDelFlag(0); + teacherOpenCourseNoticeQuery.setStartTime(stime); + teacherOpenCourseNoticeQuery.setEndTime(etime); List noticeList = teacherOpenCourseNoticeService.getValues(teacherOpenCourseNoticeQuery); data.put("noticeNum", noticeList.size()); //签到 TeacherOpenCourseStudentSigninLogQuery signQuery = new TeacherOpenCourseStudentSigninLogQuery(); signQuery.setTeacherOpenCourseId(teacherOpenCourseId); + signQuery.setStartTime(stime); + signQuery.setEndTime(etime); List signinLogs = teacherOpenCourseStudentSigninLogService.getValues(signQuery); List collect = signinLogs.stream().filter(v -> v.getTeacherOpenCourseStudentSigninLogTag().equals(SignInTypeEnum.SIGN_IN)).collect(Collectors.toList()); //签到数量 @@ -169,47 +187,79 @@ public class StatisticalAnalysisService { //总章节数 TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery(); teacherOpenCourseMergeCourseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId); + teacherOpenCourseMergeCourseInfoQuery.setCourseInfoType(2); + teacherOpenCourseMergeCourseInfoQuery.setCourseInfoStatus(1); + teacherOpenCourseMergeCourseInfoQuery.setStartTime(stime); + teacherOpenCourseMergeCourseInfoQuery.setEndTime(etime); List openCourseMergeCourseInfos = teacherOpenCourseMergeCourseInfoService.getValues(teacherOpenCourseMergeCourseInfoQuery); data.put("chapterNum", openCourseMergeCourseInfos.size()); + //习题总数 + String collect4 = openCourseMergeCourseInfos.stream().distinct().map(i -> i.getTeacherOpenCourseMergeCourseInfoId().toString()).collect(Collectors.joining(",")); TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery(); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseId(teacherOpenCourseId); + teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1); + teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingType(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE); + teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseMergeCourseInfoIdPlural(collect4); + List courseQuestionSettings = teacherOpenCourseQuestionSettingService.getValues(teacherOpenCourseQuestionSettingQuery); - List collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList()); - data.put("chapterTotal", collect1.size()); +// List collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList()); + data.put("chapterTotal", courseQuestionSettings.size()); //参与人数 + String collect1 = courseQuestionSettings.stream().distinct().map(i -> i.getTeacherOpenCourseQuestionSettingId().toString()).collect(Collectors.joining(",")); + TeacherOpenCourseQuestionLogQuery teacherOpenCourseQuestionLogQuery = new TeacherOpenCourseQuestionLogQuery(); - String stringJoiner = CollectionUtil.join(collect1, ","); - if (StringUtils.isNotEmpty(stringJoiner)) { - teacherOpenCourseQuestionLogQuery.setTeacherOpenCourseQuestionSettingIdPlural(stringJoiner); - List values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery); - int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size(); - data.put("chapterPeople", size); - } else { - data.put("chapterPeople", 0); - } + teacherOpenCourseQuestionLogQuery.setTeacherOpenCourseQuestionSettingIdPlural(collect1); + data.put("chapterPeople",StringUtils.isEmpty(collect1)? 0 : teacherOpenCourseQuestionLogService.getChapterExerciseParticipantsValuesNumber(teacherOpenCourseQuestionLogQuery)); + +// String stringJoiner = CollectionUtil.join(courseQuestionSettings, ","); +// if (CollectionUtil.isNotEmpty(collect1)) { +// teacherOpenCourseQuestionLogQuery.setTeacherOpenCourseQuestionSettingIdPlural(stringJoiner); +// List values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery); +// int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size(); +// data.put("chapterPeople", size); +// } else { +// data.put("chapterPeople", 0); +// } + + //课程实操 TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery = new TeacherOpenCourseHandsOnQuery(); teacherOpenCourseHandsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId); + teacherOpenCourseHandsOnQuery.setStartTime(stime); + teacherOpenCourseHandsOnQuery.setEndTime(etime); List handsOns = teacherOpenCourseHandsOnService.getValues(teacherOpenCourseHandsOnQuery); data.put("handsOnNum", handsOns.size()); //实操任务总数 - TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery(); - tasksQuery.setTeacherOpenCourseId(teacherOpenCourseId); - List tasksList = teacherOpenCourseHandsOnSimulationTasksService.getValues(tasksQuery); - data.put("handsOnTotal", tasksList.size()); - //实操参与人数 - HandsOnAchievementQuery achievementQuery = new HandsOnAchievementQuery(); - List list = handsOns.stream().map(TeacherOpenCourseHandsOn::getHandsOnId).collect(Collectors.toList()); - String join = CollectionUtil.join(list, ","); - if (StringUtils.isNotEmpty(join)) { - achievementQuery.setHandOnIdPlural(join); - List assessmentList = handsOnAchievementService.getValues(achievementQuery); - long count = assessmentList.stream().map(HandsOnAchievement::getStudentId).count(); - data.put("handsOnPeople", count); - } else { - data.put("handsOnPeople", 0); + String collect2 = handsOns.stream().distinct().map(i -> i.getHandsOnId().toString()).collect(Collectors.joining(",")); + + if (StringUtils.isEmpty(collect2)){ + data.put("handsOnTotal",0 ); + data.put("handsOnPeople",0 ); + }else { + TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery(); + tasksQuery.setTeacherOpenCourseId(teacherOpenCourseId); + tasksQuery.setHandsOnIdPlural(collect2); + List tasksList = teacherOpenCourseHandsOnSimulationTasksService.getValues(tasksQuery); + data.put("handsOnTotal",tasksList.size()); + + //实操参与人数 + String collect3 = tasksList.stream().map(i -> i.getTaskId().toString()).collect(Collectors.joining(",")); + StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery = new StudentHandsOnTaskLogQuery(); + studentHandsOnTaskLogQuery.setHandsOnTaskIdPlural(collect3); + data.put("handsOnPeople",StringUtils.isEmpty(collect3) ? 0 : studentHandsOnTaskLogService.getPracticalOperationParticipantsNumberValues(studentHandsOnTaskLogQuery)); } + +// List list = handsOns.stream().map(TeacherOpenCourseHandsOn::getHandsOnId).collect(Collectors.toList()); +// String join = CollectionUtil.join(list, ","); +// if (StringUtils.isNotEmpty(join)) { +// achievementQuery.setHandOnIdPlural(join); +// List assessmentList = handsOnAchievementService.getValues(achievementQuery); +// long count = assessmentList.stream().map(HandsOnAchievement::getStudentId).count(); +// data.put("handsOnPeople", count); +// } else { +// data.put("handsOnPeople", 0); +// } //作业 List settings = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.HOMEWORK_QUESTION)).collect(Collectors.toList()); //作业总次数 diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java index 253f7ad2..fb8b2265 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java @@ -13,6 +13,7 @@ import com.ibeetl.jlw.constants.StudentHandsOnTaskConstant; import com.ibeetl.jlw.dao.StudentHandsOnTaskLogDao; import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.StudentHandsOnTaskLog; +import com.ibeetl.jlw.web.query.HandsOnAchievementQuery; import com.ibeetl.jlw.web.query.StudentHandsOnTaskLogQuery; import org.apache.commons.lang3.StringUtils; import org.beetl.sql.core.SqlId; @@ -206,4 +207,16 @@ public class StudentHandsOnTaskLogService extends CoreBaseService practicalOperationParticipantsNumberValues = studentHandsOnTaskLogDao.getPracticalOperationParticipantsNumberValues(handsOnTaskLogQuery); + return practicalOperationParticipantsNumberValues.size(); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentTeacherSystemUseLogAnalysisService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentTeacherSystemUseLogAnalysisService.java index a6e834d3..52063718 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentTeacherSystemUseLogAnalysisService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentTeacherSystemUseLogAnalysisService.java @@ -39,6 +39,7 @@ import java.util.*; import static cn.hutool.core.collection.IterUtil.getFirst; import static cn.hutool.core.date.DateTime.now; import static cn.hutool.core.util.ObjectUtil.defaultIfNull; +import static cn.jlw.util.CacheUserUtil.getUniAdmin; import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue; /** @@ -343,6 +344,10 @@ public class StudentTeacherSystemUseLogAnalysisService extends CoreBaseService applicationUseLogsAnalysis(PageQuery page) { + UniversitiesColleges uniAdmin = getUniAdmin(); + if (null != uniAdmin) { + page.setPara("universitiesCollegesId", uniAdmin.getUniversitiesCollegesId()); + } return studentTeacherSystemUseLogAnalysisDao.applicationUseLogsAnalysis(page); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java index 76ff73ea..5529dbcb 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -151,6 +151,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService chapterExerciseParticipantsValuesNumber = teacherOpenCourseQuestionLogDao.getChapterExerciseParticipantsValuesNumber(paras); + return chapterExerciseParticipantsValuesNumber.size(); + } + public List getValuesByQuery (TeacherOpenCourseQuestionLogQuery teacherOpenCourseQuestionLogQuery){ return teacherOpenCourseQuestionLogDao.getValuesByQuery(teacherOpenCourseQuestionLogQuery); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHandsOnQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHandsOnQuery.java index 629e4cae..ac778f95 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHandsOnQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHandsOnQuery.java @@ -46,6 +46,16 @@ public class TeacherOpenCourseHandsOnQuery extends PageParam { private String _given;//指定更新的特定字段，多个逗号隔开 + /** + * 开始时间 + */ + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + public Long getHandsOnId(){ return handsOnId; } @@ -152,4 +162,20 @@ public class TeacherOpenCourseHandsOnQuery extends PageParam { public void set_given(String _given) { this._given = _given; } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java index 38c6ad3a..27c5f796 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java @@ -7,6 +7,7 @@ import com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.util.Date; /** *开课课程拉取查询 @@ -75,6 +76,19 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam { private Boolean innerJoin; + //新增时间 + private Date addTime; + + /** + * 开始时间 + */ + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + public Long getTeacherOpenCourseMergeCourseInfoId(){ return teacherOpenCourseMergeCourseInfoId; } @@ -204,6 +218,7 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam { pojo.setResourcesTrainingIds(this.getResourcesTrainingIds()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); + pojo.setAddTime(this.getAddTime()); return pojo; } @@ -287,4 +302,28 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam { public void setInnerJoin(Boolean innerJoin) { this.innerJoin = innerJoin; } + + public Date getAddTime() { + return addTime; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public void setAddTime(Date addTime) { + this.addTime = addTime; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java index 5a988121..40443011 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java @@ -9,6 +9,7 @@ import com.ibeetl.jlw.enums.GlobalUpStatusEnum; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.util.Date; import static cn.hutool.core.util.ObjectUtil.defaultIfNull; @@ -40,6 +41,11 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam implemen @Query(name = "后台用户ID", display = false) private Long userId; + /** + * 新增时间 + */ + private Date addTime; + private String teacherOpenCourseMergeResourcesInfoIdPlural; private String teacherOpenCourseMergeCourseInfoIdPlural; private String teacherOpenCourseIdPlural; @@ -50,6 +56,16 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam implemen private String _given;//指定更新的特定字段，多个逗号隔开 + /** + * 开始时间 + */ + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + public Long getTeacherOpenCourseMergeResourcesInfoId(){ return teacherOpenCourseMergeResourcesInfoId; } @@ -106,6 +122,7 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam implemen pojo.setResourcesInfoStatus(defaultIfNull(this.getResourcesInfoStatus(), GlobalUpStatusEnum.UP)); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); + pojo.setAddTime(this.addTime); return pojo; } @@ -186,6 +203,30 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam implemen this.resourcesInfoStatus = resourcesInfoStatus; } + public Date getAddTime() { + return addTime; + } + + public void setAddTime(Date addTime) { + this.addTime = addTime; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + @Override public TeacherOpenCourseMergeResourcesInfoQuery clone() { return BeanUtil.copyProperties(this, this.getClass()); diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseNoticeQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseNoticeQuery.java index 20f57a3d..2e6b00cc 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseNoticeQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseNoticeQuery.java @@ -47,6 +47,16 @@ public class TeacherOpenCourseNoticeQuery extends PageParam { private String _given;//指定更新的特定字段，多个逗号隔开 + /** + * 开始时间 + */ + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + public Long getTeacherOpenCourseNoticeId(){ return teacherOpenCourseNoticeId; } @@ -167,4 +177,20 @@ public class TeacherOpenCourseNoticeQuery extends PageParam { public void setStudentId(Long studentId) { this.studentId = studentId; } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java index 6da5f325..ab2dad93 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java @@ -97,6 +97,7 @@ public class TeacherOpenCourseQuestionSettingQuery extends PageParam { private String teacherOpenCourseQuestionSettingStatusPlural; private String orgIdPlural; private String userIdPlural; + private String teacherOpenCourseMergeCourseInfoIdPlural; /** * 是否查询当前用户的得分情况，等其他信息，加速查询速度。 仅支持此方法{@link TeacherOpenCourseQuestionSettingController#getList} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java index 1814cc72..60cabd59 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java @@ -80,6 +80,16 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam { private String _given;//指定更新的特定字段，多个逗号隔开 + /** + * 开始时间 + */ + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + public Long getTeacherOpenCourseStudentSigninLogId(){ return teacherOpenCourseStudentSigninLogId; } @@ -233,4 +243,20 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam { public void setStudentSnOrName(String studentSnOrName) { this.studentSnOrName = studentSnOrName; } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } } diff --git a/web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md b/web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md index 119a701b..62638186 100644 --- a/web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md +++ b/web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md @@ -363,3 +363,19 @@ updateTime * 更新日志时间 update student_hands_on_task_log t set t.last_update_time = now(),t.all_time= (IFNULL(t.all_time,0) + #text(taskLogSeconds)#) where t.student_hands_on_task_ppt_id = #studentHandsOnTaskPptId# + + +getPracticalOperationParticipantsNumberValues +=== + +* 获取实操参与人数 + SELECT + a.student_id + FROM + student_hands_on_task_log a + WHERE + 1=1 + @if(!isEmpty(handsOnTaskIdPlural)) { + AND FIND_IN_SET(a.hands_on_task_id,#handsOnTaskIdPlural#) + @} + GROUP BY a.student_id \ No newline at end of file diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md b/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md index 4cf9cf45..3fb366c3 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md @@ -232,6 +232,9 @@ getTeacherOpenCourseHandsOnValues @if(!isEmpty(trainingData)){ and t.training_data =#trainingData# @} + @if(!isEmpty(startTime) && !isEmpty(endTime)){ + and t.add_time BETWEEN #startTime# AND date_add(#endTime#,interval 1 day) + @} getValuesByQuery diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOnSimulationTasks.md b/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOnSimulationTasks.md index 0da7327b..f5d25be2 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOnSimulationTasks.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseHandsOnSimulationTasks.md @@ -340,6 +340,9 @@ getTeacherOpenCourseHandsOnSimulationTasksValues @if(!isEmpty(addTime)){ and t.add_time =#addTime# @} + @if(!isEmpty(handsOnIdPlural)){ + and find_in_set(t.hands_on_id,#handsOnIdPlural#) + @} getValuesByQuery diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md index fb7ece83..31c0ef93 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md @@ -434,6 +434,9 @@ getTeacherOpenCourseMergeCourseInfoValues @if(!isEmpty(userId)){ and t.user_id =#userId# @} + @if(!isEmpty(startTime) && !isEmpty(endTime)){ + and t.add_time BETWEEN #startTime# AND date_add(#endTime#,interval 1 day) + @} getValuesByQuery diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md index a63e9445..1f3a76dd 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md @@ -307,7 +307,9 @@ getValuesByQuery @if(!isEmpty(userIdPlural)){ and find_in_set(t.user_id,#userIdPlural#) @} - + @if(!isEmpty(startTime) && !isEmpty(endTime)){ + and t.add_time BETWEEN #startTime# AND date_add(#endTime#,interval 1 day) + @} getValuesByQueryNotWithPermission === diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md b/web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md index 1a6d6c3c..18142630 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md @@ -241,7 +241,9 @@ getTeacherOpenCourseNoticeValues @if(!isEmpty(delFlag)){ and t.del_flag =#delFlag# @} - + @if(!isEmpty(startTime) && !isEmpty(endTime)){ + and t.create_time BETWEEN #startTime# AND date_add(#endTime#,interval 1 day) + @} getValuesByQuery === diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md index 7d029eb0..0989ca58 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md @@ -1056,4 +1056,19 @@ logicDeleteQuestionLogBySummaryQuestionIds not find_in_set( t.teacher_open_course_question_log_id, ( SELECT question_log_ids FROM question_log_summary a WHERE a.question_setting_id = t.teacher_open_course_question_setting_id )) - AND t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# \ No newline at end of file + AND t.teacher_open_course_question_setting_id = #teacherOpenCourseQuestionSettingId# + +getChapterExerciseParticipantsValuesNumber +=== + +* 获取练习章节参与人数 + SELECT + a.student_id + FROM + teacher_open_course_question_log a + WHERE + a.teacher_open_course_question_log_status = 1 + @if(isNotEmpty(teacherOpenCourseQuestionSettingIdPlural)) { + AND FIND_IN_SET(a.teacher_open_course_question_setting_id,#teacherOpenCourseQuestionSettingIdPlural#) + @} + GROUP BY a.student_id \ No newline at end of file diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md index 0a69c359..6458014e 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md @@ -426,6 +426,9 @@ getTeacherOpenCourseQuestionSettingValues @if(!isEmpty(userId)){ and t.user_id =#userId# @} + @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){ + and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#) + @} getValuesByQuery diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md index 7c874f7b..66e0ad5e 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md @@ -295,6 +295,9 @@ getTeacherOpenCourseStudentSigninLogValues @if(!isEmpty(userId)){ and t.user_id =#userId# @} + @if(!isEmpty(startTime) && !isEmpty(endTime)){ + and t.teacher_open_course_student_signin_log_add_time BETWEEN #startTime# AND date_add(#endTime#,interval 1 day) + @} getValuesByQuery