tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、我的课程统计分析

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 06c887d7b3
commit 33ef9c1584
28 changed files with 369 additions and 41 deletions
Show Stats Download Patch File Download Diff File

9
web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskLogDao.java
Unescape Escape View File

@ -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<StudentHandsOnTaskL
@Update
void updateTime(Long studentHandsOnTaskPptId, Long taskLogSeconds);
/**
* 获取实操参与人数
* @param handsOnTaskLogQuery
* @return
*/
List<Long> getPracticalOperationParticipantsNumberValues(StudentHandsOnTaskLogQuery handsOnTaskLogQuery);
}

7
web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java
Unescape Escape View File

@ -183,4 +183,11 @@ public interface TeacherOpenCourseQuestionLogDao extends BaseMapper<TeacherOpenC
* @return
*/
boolean logicDeleteQuestionLogBySummaryQuestionIds(Long questionSettingId);
/**
* 获取练习章节参与人数
* @param pageQuery
* @return
*/
List<Long> getChapterExerciseParticipantsValuesNumber(TeacherOpenCourseQuestionLogQuery pageQuery);
}

11
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
Unescape Escape View File

@ -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<TeacherOpenCourseMergeCourseInfo>)this.get("children");
}
public Date getAddTime() {
return addTime;
}
public void setAddTime(Date addTime) {
this.addTime = addTime;
}
@Override
public int compareTo(TeacherOpenCourseMergeCourseInfo o) {

14
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
Unescape Escape View File

@ -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;
}
}

2
web/src/main/java/com/ibeetl/jlw/service/HandsOnAchievementService.java
Unescape Escape View File

@ -128,7 +128,7 @@ public class HandsOnAchievementService extends CoreBaseService<HandsOnAchievemen
}
}
int schedule = NumberUtil.div(decimal, BigDecimal.valueOf(tasksList.size()), 2).multiply(BigDecimal.valueOf(100)).intValue();
handsOnAchievement.set("schedule",schedule);
handsOnAchievement.set("schedule", schedule);
}
}

114
web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.ibeetl.jlw.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
import com.ibeetl.admin.core.dao.CoreUserDao;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.util.enums.DelFlagEnum;
@ -99,6 +100,8 @@ public class StatisticalAnalysisService {
@Autowired
private TeacherOpenCourseMergeResourcesQuestionService teacherOpenCourseMergeResourcesQuestionService;
@Autowired
private StudentHandsOnTaskLogService studentHandsOnTaskLogService;
private static final String PATTERN = "(?<=\"code\":\\[\").*?(?=\"\\],)";
Pattern r = Pattern.compile(PATTERN);
@ -117,11 +120,13 @@ public class StatisticalAnalysisService {
//班级数
TeacherOpenCourseMergeSchoolClassQuery classQuery = new TeacherOpenCourseMergeSchoolClassQuery();
classQuery.setTeacherOpenCourseId(teacherOpenCourseId);
classQuery.setTeacherOpenCourseMergeSchoolClassStatus(1);
List<TeacherOpenCourseMergeSchoolClass> schoolClasses = teacherOpenCourseMergeSchoolClassService.getValues(classQuery);
data.put("classNum", schoolClasses.size());
//学生人数
TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery = new TeacherOpenCourseMergeStudentQuery();
teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseId(teacherOpenCourseId);
teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
List<TeacherOpenCourseMergeStudent> 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<TeacherOpenCourseMergeCourseInfo> courseInfos = teacherOpenCourseMergeCourseInfoService.getValuesByQueryNotWithPermission(courseInfoQuery);
List<TeacherOpenCourseMergeCourseInfo> videoCount = courseInfos.stream().filter(v -> v.getCourseVideoId() != null).collect(Collectors.toList());
// TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery();
// courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId);
// courseInfoQuery.setCourseInfoStatus(1);
// List<TeacherOpenCourseMergeCourseInfo> courseInfos = teacherOpenCourseMergeCourseInfoService.getValuesByQueryNotWithPermission(courseInfoQuery);
// List<TeacherOpenCourseMergeCourseInfo> 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> teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery);
List<TeacherOpenCourseMergeResourcesInfo> 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<TeacherOpenCourseNotice> noticeList = teacherOpenCourseNoticeService.getValues(teacherOpenCourseNoticeQuery);
data.put("noticeNum", noticeList.size());
//签到
TeacherOpenCourseStudentSigninLogQuery signQuery = new TeacherOpenCourseStudentSigninLogQuery();
signQuery.setTeacherOpenCourseId(teacherOpenCourseId);
signQuery.setStartTime(stime);
signQuery.setEndTime(etime);
List<TeacherOpenCourseStudentSigninLog> signinLogs = teacherOpenCourseStudentSigninLogService.getValues(signQuery);
List<TeacherOpenCourseStudentSigninLog> 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<TeacherOpenCourseMergeCourseInfo> 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<TeacherOpenCourseQuestionSetting> courseQuestionSettings = teacherOpenCourseQuestionSettingService.getValues(teacherOpenCourseQuestionSettingQuery);
List<TeacherOpenCourseQuestionSetting> collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList());
data.put("chapterTotal", collect1.size());
// List<TeacherOpenCourseQuestionSetting> 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<TeacherOpenCourseQuestionLog> 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<TeacherOpenCourseQuestionLog> 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<TeacherOpenCourseHandsOn> handsOns = teacherOpenCourseHandsOnService.getValues(teacherOpenCourseHandsOnQuery);
data.put("handsOnNum", handsOns.size());
//实操任务总数
TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
tasksQuery.setTeacherOpenCourseId(teacherOpenCourseId);
List<TeacherOpenCourseHandsOnSimulationTasks> tasksList = teacherOpenCourseHandsOnSimulationTasksService.getValues(tasksQuery);
data.put("handsOnTotal", tasksList.size());
//实操参与人数
HandsOnAchievementQuery achievementQuery = new HandsOnAchievementQuery();
List<Long> list = handsOns.stream().map(TeacherOpenCourseHandsOn::getHandsOnId).collect(Collectors.toList());
String join = CollectionUtil.join(list, ",");
if (StringUtils.isNotEmpty(join)) {
achievementQuery.setHandOnIdPlural(join);
List<HandsOnAchievement> 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<TeacherOpenCourseHandsOnSimulationTasks> 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<Long> list = handsOns.stream().map(TeacherOpenCourseHandsOn::getHandsOnId).collect(Collectors.toList());
// String join = CollectionUtil.join(list, ",");
// if (StringUtils.isNotEmpty(join)) {
// achievementQuery.setHandOnIdPlural(join);
// List<HandsOnAchievement> assessmentList = handsOnAchievementService.getValues(achievementQuery);
// long count = assessmentList.stream().map(HandsOnAchievement::getStudentId).count();
// data.put("handsOnPeople", count);
// } else {
// data.put("handsOnPeople", 0);
// }
//作业
List<TeacherOpenCourseQuestionSetting> settings = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.HOMEWORK_QUESTION)).collect(Collectors.toList());
//作业总次数

13
web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskLogService.java
Unescape Escape View File

@ -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<StudentHandsOn
return jsonResult;
}
/**
* 获取实操参与人数
*
* @param handsOnTaskLogQuery
* @return
*/
public Integer getPracticalOperationParticipantsNumberValues(StudentHandsOnTaskLogQuery handsOnTaskLogQuery) {
List<Long> practicalOperationParticipantsNumberValues = studentHandsOnTaskLogDao.getPracticalOperationParticipantsNumberValues(handsOnTaskLogQuery);
return practicalOperationParticipantsNumberValues.size();
}
}

5
web/src/main/java/com/ibeetl/jlw/service/StudentTeacherSystemUseLogAnalysisService.java
Unescape Escape View File

@ -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<S
* @return
*/
public PageQuery<SystemUseLogsAnalysisVO> applicationUseLogsAnalysis(PageQuery<SystemUseLogsAnalysisDTO> page) {
UniversitiesColleges uniAdmin = getUniAdmin();
if (null != uniAdmin) {
page.setPara("universitiesCollegesId", uniAdmin.getUniversitiesCollegesId());
}
return studentTeacherSystemUseLogAnalysisDao.applicationUseLogsAnalysis(page);
}

1
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java
Unescape Escape View File

@ -151,6 +151,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
public JsonResult add(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery) {
String msg = "";
TeacherOpenCourseHandsOn teacherOpenCourseHandsOn = teacherOpenCourseHandsOnQuery.pojo();
teacherOpenCourseHandsOn.setAddTime(new Date());
teacherOpenCourseHandsOnDao.insert(teacherOpenCourseHandsOn);
teacherOpenCourseHandsOnQuery.setHandsOnId(teacherOpenCourseHandsOn.getHandsOnId());
JsonResult jsonResult = new JsonResult();

6
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java
Unescape Escape View File

@ -36,10 +36,7 @@ import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
import static cn.hutool.core.util.ArrayUtil.join;
@ -154,6 +151,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
String msg = "";
TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksQuery.pojo();
teacherOpenCourseHandsOnSimulationTasks.setAddTime(new Date());
String handsOnTaskProblemVo = teacherOpenCourseHandsOnSimulationTasksQuery.getHandsOnTaskProblemVo();
Long handsOnId = teacherOpenCourseHandsOnSimulationTasks.getHandsOnId();
//分数

2
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
Unescape Escape View File

@ -239,7 +239,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
String msg = "";
TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = query.pojo();
teacherOpenCourseMergeCourseInfo.setCourseInfoStatus(1);
teacherOpenCourseMergeCourseInfo.setAddTime(new Date());
// 获取新的排序值
TeacherOpenCourseMergeCourseInfo paras = new TeacherOpenCourseMergeCourseInfo();
paras.setCourseInfoType(teacherOpenCourseMergeCourseInfo.getCourseInfoType());

1
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
Unescape Escape View File

@ -134,6 +134,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
}
public JsonResult add(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
teacherOpenCourseMergeResourcesInfoQuery.setAddTime(new Date());
String msg = "";
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo();

10
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
Unescape Escape View File

@ -225,6 +225,16 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
return sqlManager.select(SqlId.of("jlw.teacherOpenCourseQuestionLog.getTeacherOpenCourseQuestionLogValues"), TeacherOpenCourseQuestionLog.class, paras);
}
/**
* 获取练习章节参与人数
* @param paras
* @return
*/
public Integer getChapterExerciseParticipantsValuesNumber (TeacherOpenCourseQuestionLogQuery paras){
List<Long> chapterExerciseParticipantsValuesNumber = teacherOpenCourseQuestionLogDao.getChapterExerciseParticipantsValuesNumber(paras);
return chapterExerciseParticipantsValuesNumber.size();
}
public List<TeacherOpenCourseQuestionLog> getValuesByQuery (TeacherOpenCourseQuestionLogQuery teacherOpenCourseQuestionLogQuery){
return teacherOpenCourseQuestionLogDao.getValuesByQuery(teacherOpenCourseQuestionLogQuery);
}

26
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHandsOnQuery.java
Unescape Escape View File

@ -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;
}
}

39
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java
Unescape Escape View File

@ -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;
}
}

41
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java
Unescape Escape View File

@ -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());

26
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseNoticeQuery.java
Unescape Escape View File

@ -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;
}
}

1
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java
Unescape Escape View File

@ -97,6 +97,7 @@ public class TeacherOpenCourseQuestionSettingQuery extends PageParam {
private String teacherOpenCourseQuestionSettingStatusPlural;
private String orgIdPlural;
private String userIdPlural;
private String teacherOpenCourseMergeCourseInfoIdPlural;
/**
* 是否查询当前用户的得分情况，等其他信息，加速查询速度。 仅支持此方法{@link TeacherOpenCourseQuestionSettingController#getList}

26
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java
Unescape Escape View File

@ -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;
}
}

16
web/src/main/resources/sql/jlw/studentHandsOnTaskLog.md
Unescape Escape View File

@ -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

3
web/src/main/resources/sql/jlw/teacherOpenCourseHandsOn.md
Unescape Escape View File

@ -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

3
web/src/main/resources/sql/jlw/teacherOpenCourseHandsOnSimulationTasks.md
Unescape Escape View File

@ -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

3
web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md
Unescape Escape View File

@ -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

4
web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md
Unescape Escape View File

@ -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
===

4
web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md
Unescape Escape View File

@ -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
===

17
web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md
Unescape Escape View File

@ -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#
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

3
web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md
Unescape Escape View File

@ -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

3
web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md
Unescape Escape View File

@ -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

Write Preview
Loading…
Cancel
Save