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

1、开课课程课程编码自动生成

Browse Source 
2、首页不选择日期显示全部数据
beetlsql3-dev
wgf 2 years ago
parent 3005178ba5
commit a7a72bcfc0
2 changed files with 59 additions and 21 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,6 +1,5 @@
package com.ibeetl.jlw.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
@ -16,11 +15,15 @@ import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionExperimentalSystemDao;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.vo.StudentLogAnalysisVO;
import com.ibeetl.jlw.entity.vo.StudentLoginLogVO;
import com.ibeetl.jlw.enums.*;
import com.ibeetl.jlw.enums.ChatLogSendTypeEnum;
import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
import com.ibeetl.jlw.enums.GlobalUpStatusEnum;
import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import com.ibeetl.jlw.web.query.*;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.query.LambdaQuery;
import org.beetl.sql.core.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -457,8 +460,10 @@ public class StatisticalAnalysisService {
}
public Map<String, Object> adminIndexDetail(Date stime, Date etime, UniversitiesColleges universitiesColleges, CoreUser coreUser) {
Date startTime = DateUtil.beginOfDay(new Date());
Date endTime = DateUtil.endOfDay(new Date());
// Date startTime = DateUtil.beginOfDay(new Date());
// Date endTime = DateUtil.endOfDay(new Date());
Date startTime = null;
Date endTime = null;
if (!Objects.isNull(stime)) {
startTime = DateUtil.beginOfDay(stime);
}
@ -507,8 +512,12 @@ public class StatisticalAnalysisService {
// long loginDistinctCount = loginDistinctCountQuery.count();
StudentLoginLogQuery condition = new StudentLoginLogQuery();
if (ObjectUtil.isNotEmpty(startTime)){
condition.setLoginStartTime(startTime);
}
if (ObjectUtil.isNotEmpty(endTime)){
condition.setLoginEndTime(endTime);
}
condition.setLoginPath(ResponseControllerAdvice.LOGIN_URL);
condition.setLogoutPath(KeyExpiredListener.TOKEN_EXPIRED_MESSAGE);
UniversitiesColleges uniAdmin = getUniAdmin();
@ -532,8 +541,12 @@ public class StatisticalAnalysisService {
// List<CourseInfo> theoryCourseList = universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(orgId).getTheoryCourseList();
TeacherOpenCourseQuery teacherOpenCourseQuery = new TeacherOpenCourseQuery();
if (ObjectUtil.isNotEmpty(startTime)){
teacherOpenCourseQuery.setFilterStartTime(startTime);
}
if (ObjectUtil.isNotEmpty(endTime)){
teacherOpenCourseQuery.setFilterEndTime(endTime);
}
List<TeacherOpenCourse> teacherOpenCourseMergeCourseInfo = teacherOpenCourseService.getTeacherOpenCourseMergeCourseInfo(teacherOpenCourseQuery, coreUser);
data.put("courseNumber", teacherOpenCourseMergeCourseInfo.size());
@ -563,8 +576,12 @@ public class StatisticalAnalysisService {
}
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
if (ObjectUtil.isNotEmpty(startTime)){
teacherOpenCourseQuestionSettingQuery.setStartTime(startTime);
}
if (ObjectUtil.isNotEmpty(endTime)){
teacherOpenCourseQuestionSettingQuery.setEndTime(endTime);
}
List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery);
// 学生做题：读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】，这几个模块的任务数量
@ -579,8 +596,12 @@ public class StatisticalAnalysisService {
//课件学习
TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
tasksQuery.setTeacherOpenCourseIdPlural(CollectionUtil.join(collect11, ","));
if (ObjectUtil.isNotEmpty(startTime)){
tasksQuery.setStartTime(startTime);
}
if (ObjectUtil.isNotEmpty(endTime)){
tasksQuery.setEndTime(endTime);
}
if (orgId != 1) {
tasksQuery.setOrgId(orgId);
}
@ -597,9 +618,11 @@ public class StatisticalAnalysisService {
if (uniOrgId != null && uniOrgId != 1) {
lambdaQuery2.andEq(CoreUser::getOrgId, uniOrgId);
}
if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){
lambdaQuery2.andBetween(CoreUser::getCreateTime, startTime, endTime);
}
int size = lambdaQuery2.andEq(CoreUser::getDelFlag, DelFlagEnum.NORMAL.getValue())
.andNotEq(CoreUser::getId, 1)
.andBetween(CoreUser::getCreateTime, startTime, endTime)
.select().size();
data.put("userNumber", size);
//案例数量
@ -607,22 +630,28 @@ public class StatisticalAnalysisService {
if (uniOrgId != null && uniOrgId != 1) {
lambdaQuery3.andEq(HandsOn::getOrgId, uniOrgId);
}
if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){
lambdaQuery3.andBetween(HandsOn::getAddTime, startTime, endTime);
}
int values = lambdaQuery3.andEq(HandsOn::getHandsOnStatus, 1)
.andBetween(HandsOn::getAddTime, startTime, endTime)
.select().size();
LambdaQuery<ResourcesTraining> lambdaQuery4 = resourcesTrainingService.createLambdaQuery();
if (uniOrgId != null && uniOrgId != 1) {
lambdaQuery4.andEq(ResourcesTraining::getOrgId, uniOrgId);
}
if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){
lambdaQuery4.andBetween(ResourcesTraining::getAddTime, startTime, endTime);
}
int values2 = lambdaQuery4.andEq(ResourcesTraining::getResourcesTrainingStatus, 1)
.andBetween(ResourcesTraining::getAddTime, startTime, endTime)
.select().size();
LambdaQuery<ResourcesCompetition> lambdaQuery5 = resourcesCompetitionService.createLambdaQuery();
if (uniOrgId != null && uniOrgId != 1) {
lambdaQuery5.andEq(ResourcesCompetition::getOrgId, uniOrgId);
}
if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){
lambdaQuery5.andBetween(ResourcesCompetition::getAddTime, startTime, endTime);
}
int values3 = lambdaQuery5.andEq(ResourcesCompetition::getResourcesCompetitionStatus, 1)
.andBetween(ResourcesCompetition::getAddTime, startTime, endTime)
.select().size();
data.put("caseNumber", values + values2 + values3);
//视频数量
@ -641,8 +670,12 @@ public class StatisticalAnalysisService {
if (uniOrgId != null && uniOrgId != 1) {
paras1.setOrgId(uniOrgId);
}
if (ObjectUtil.isNotEmpty(startTime)){
paras1.setStartTime(startTime);
}
if (ObjectUtil.isNotEmpty(endTime)){
paras1.setEndTime(endTime);
}
List<ResourcesQuestion> questionList = resourcesQuestionService.getValues(paras1);
data.put("questionNumber", questionList.size());
//院校数量
@ -651,8 +684,12 @@ public class StatisticalAnalysisService {
if (uniOrgId != null && uniOrgId != 1) {
paras.setOrgId(uniOrgId);
}
if (ObjectUtil.isNotEmpty(startTime)){
paras.setStartTime(startTime);
}
if (ObjectUtil.isNotEmpty(endTime)){
paras.setEndTime(endTime);
}
List<UniversitiesColleges> schoolList = universitiesCollegesService.getValues(paras);
data.put("schoolNumber", schoolList.size());
return data;

3
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.ibeetl.jlw.service;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.jlw.util.ToolUtils;
@ -188,7 +189,7 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
TeacherOpenCourse teacherOpenCourse = teacherOpenCourseQuery.pojo();
teacherOpenCourse.setCreateTime(new Date());
teacherOpenCourse.setTeacherOpenCourseStatus(1);
teacherOpenCourse.setTeacherOpenCourseCode(String.valueOf(System.currentTimeMillis()));
teacherOpenCourseDao.insert(teacherOpenCourse);
// 开课和教师关联数据

Write Preview
Loading…
Cancel
Save