diff --git a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java index cb836a68..da69be42 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java @@ -8,10 +8,7 @@ import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.util.enums.DelFlagEnum; import com.ibeetl.jlw.dao.*; import com.ibeetl.jlw.entity.*; -import com.ibeetl.jlw.enums.ChatLogSendTypeEnum; -import com.ibeetl.jlw.enums.GlobalPushStatusEnum; -import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum; -import com.ibeetl.jlw.enums.SignInTypeEnum; +import com.ibeetl.jlw.enums.*; import com.ibeetl.jlw.web.query.*; import org.apache.commons.lang3.StringUtils; import org.beetl.sql.core.query.LambdaQuery; @@ -28,48 +25,79 @@ import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.HOMEWOR /** * 统计分析service + * * @Version 0.0.1 * @Author 许良彤 * @Date 2022/10/7 12:25 - * */ @Service public class StatisticalAnalysisService { - @Autowired private StatisticalAnalysisDao statisticalAnalysisDao; - @Autowired private TeacherOpenCourseMergeSchoolClassService teacherOpenCourseMergeSchoolClassService; - @Autowired private TeacherOpenCourseMergeStudentService teacherOpenCourseMergeStudentService; - @Autowired private TeacherOpenCourseNoticeService teacherOpenCourseNoticeService; - @Autowired private StudentService studentService; - @Autowired private TeacherService teacherService; - @Autowired private CourseInfoService courseInfoService; - @Autowired private ResourcesApplicationService resourcesApplicationService; - @Autowired private UniversitiesCollegesDao universitiesCollegesDao; - @Autowired private SysLogDao sysLogDao; - @Autowired private UniversitiesCollegesService universitiesCollegesService; - @Autowired private CoreUserDao coreUserDao; - @Autowired private ResourcesTrainingDao resourcesTrainingService; - @Autowired private ResourcesInfoService resourcesInfoService; - @Autowired private ResourcesQuestionService resourcesQuestionService; - @Autowired private TeacherOpenCourseStudentSigninLogService teacherOpenCourseStudentSigninLogService; - @Autowired private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService; - @Autowired private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService; - @Autowired private TeacherOpenCourseQuestionLogService teacherOpenCourseQuestionLogService; - @Autowired private TeacherOpenCourseHandsOnService teacherOpenCourseHandsOnService; - @Autowired private TeacherOpenCourseHandsOnSimulationTasksService teacherOpenCourseHandsOnSimulationTasksService; - @Autowired private HandsOnAchievementService handsOnAchievementService; - @Autowired private TeacherOpenCourseChatLogService teacherOpenCourseChatLogService; - @Autowired private TeacherOpenCourseDao teacherOpenCourseService; - @Autowired private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao; - @Autowired private HandsOnDao handsOnService; - @Autowired private ResourcesCompetitionDao resourcesCompetitionService; - @Autowired private TeacherOpenCourseScoreDashboardDao teacherOpenCourseScoreDashboardDao; - @Autowired private QuestionLogSummaryDao questionLogSummaryDao; - @Autowired private TeacherOpenCourseQuestionLogDao teacherOpenCourseQuestionLogDao; - @Autowired private ResourcesQuestionSnapshotService resourcesQuestionSnapshotService; - @Autowired private ResourcesQuestionSnapshotDao resourcesQuestionSnapshotDao; - @Autowired private UniversitiesCollegesJurisdictionExperimentalSystemDao universitiesCollegesJurisdictionExperimentalSystemDao; - @Autowired private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService; + + @Autowired + private TeacherOpenCourseMergeSchoolClassService teacherOpenCourseMergeSchoolClassService; + @Autowired + private TeacherOpenCourseMergeStudentService teacherOpenCourseMergeStudentService; + @Autowired + private TeacherOpenCourseNoticeService teacherOpenCourseNoticeService; + @Autowired + private StudentService studentService; + @Autowired + private TeacherService teacherService; + + @Autowired + private ResourcesApplicationService resourcesApplicationService; + @Autowired + private UniversitiesCollegesDao universitiesCollegesDao; + @Autowired + private SysLogDao sysLogDao; + @Autowired + private UniversitiesCollegesService universitiesCollegesService; + @Autowired + private CoreUserDao coreUserDao; + @Autowired + private ResourcesTrainingDao resourcesTrainingService; + @Autowired + private ResourcesInfoService resourcesInfoService; + @Autowired + private ResourcesQuestionService resourcesQuestionService; + @Autowired + private TeacherOpenCourseStudentSigninLogService teacherOpenCourseStudentSigninLogService; + @Autowired + private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingService; + @Autowired + private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService; + @Autowired + private TeacherOpenCourseQuestionLogService teacherOpenCourseQuestionLogService; + @Autowired + private TeacherOpenCourseHandsOnService teacherOpenCourseHandsOnService; + @Autowired + private TeacherOpenCourseHandsOnSimulationTasksService teacherOpenCourseHandsOnSimulationTasksService; + @Autowired + private HandsOnAchievementService handsOnAchievementService; + @Autowired + private TeacherOpenCourseChatLogService teacherOpenCourseChatLogService; + @Autowired + private TeacherOpenCourseDao teacherOpenCourseService; + @Autowired + private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao; + @Autowired + private HandsOnDao handsOnService; + @Autowired + private ResourcesCompetitionDao resourcesCompetitionService; + @Autowired + private TeacherOpenCourseScoreDashboardDao teacherOpenCourseScoreDashboardDao; + + @Autowired + private UniversitiesCollegesJurisdictionExperimentalSystemDao universitiesCollegesJurisdictionExperimentalSystemDao; + @Autowired + private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService; + + @Autowired + private TeacherOpenCourseMergeResourcesInfoService teacherOpenCourseMergeResourcesInfoService; + + @Autowired + private TeacherOpenCourseMergeResourcesQuestionService teacherOpenCourseMergeResourcesQuestionService; private static final String PATTERN = "(?<=\"code\":\\[\").*?(?=\"\\],)"; @@ -77,6 +105,7 @@ public class StatisticalAnalysisService { /** * 统计分析 + * * @param */ public Map detail(Long teacherOpenCourseId, Date stime, Date etime) { @@ -101,9 +130,9 @@ public class StatisticalAnalysisService { long count1 = scoreDashboards.stream().filter(v -> "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count(); long l = scoreDashboards.size() - count1; - data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l,studentList.size()), 0)); - data.put("studentPassNum",l ); - }else { + data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l, studentList.size()), 0)); + data.put("studentPassNum", l); + } else { data.put("passRate", "0%"); data.put("studentPassNum", 0); } @@ -130,9 +159,9 @@ public class StatisticalAnalysisService { //签到数量 data.put("signInNum", collect.size()); //到课率 - if(CollectionUtil.isNotEmpty(collect)) { + if (CollectionUtil.isNotEmpty(collect)) { data.put("signInRate", NumberUtil.div(NumberUtil.toBigDecimal(collect.size()), NumberUtil.toBigDecimal(signinLogs.size()), 2).multiply(BigDecimal.valueOf(100)).intValue()); - }else { + } else { data.put("signInRate", 0); } //章节练习 @@ -156,7 +185,7 @@ public class StatisticalAnalysisService { List values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery); int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size(); data.put("chapterPeople", size); - }else { + } else { data.put("chapterPeople", 0); } //课程实操 @@ -178,7 +207,7 @@ public class StatisticalAnalysisService { List assessmentList = handsOnAchievementService.getValues(achievementQuery); long count = assessmentList.stream().map(HandsOnAchievement::getStudentId).count(); data.put("handsOnPeople", count); - }else { + } else { data.put("handsOnPeople", 0); } //作业 @@ -193,7 +222,7 @@ public class StatisticalAnalysisService { List values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery); int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size(); data.put("homeworkPeople", size); - }else { + } else { //作业参与人数 data.put("homeworkPeople", 0); } @@ -207,7 +236,7 @@ public class StatisticalAnalysisService { List values = teacherOpenCourseQuestionLogService.getValues(teacherOpenCourseQuestionLogQuery); int size = values.stream().map(TeacherOpenCourseQuestionLog::getStudentId).collect(Collectors.toSet()).size(); data.put("examPeople", size); - }else { + } else { //考试参与人数 data.put("examPeople", 0); } @@ -232,6 +261,7 @@ public class StatisticalAnalysisService { /** * 首页 + * * @param * @return */ @@ -261,24 +291,37 @@ public class StatisticalAnalysisService { List studentList = teacherOpenCourseMergeStudentService.getValuesByQueryNotWithPermission(studentQuery); data.put("studentNum", studentList.size()); //课件 + TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery = new TeacherOpenCourseMergeResourcesInfoQuery(); + teacherOpenCourseMergeResourcesInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId); + teacherOpenCourseMergeResourcesInfoQuery.setResourcesInfoStatus(GlobalUpStatusEnum.UP); + List resourcesInfoList = teacherOpenCourseMergeResourcesInfoService.getValuesByQueryNotWithPermission(teacherOpenCourseMergeResourcesInfoQuery); + data.put("coursewareNum", resourcesInfoList.size()); + TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery(); courseInfoQuery.setTeacherOpenCourseId(teacherOpenCourseId); courseInfoQuery.setCourseInfoStatus(1); List courseInfos = teacherOpenCourseMergeCourseInfoService.getValuesByQueryNotWithPermission(courseInfoQuery); - data.put("coursewareNum", courseInfos.size()); //视频 List videoCount = courseInfos.stream().filter(v -> v.getCourseVideoId() != null).collect(Collectors.toList()); data.put("videoNum", videoCount.size()); + //题目 //习题总数 + + TeacherOpenCourseMergeResourcesQuestionQuery teacherOpenCourseMergeResourcesQuestionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery(); + teacherOpenCourseMergeResourcesQuestionQuery.setTeacherOpenCourseId(teacherOpenCourseId); + teacherOpenCourseMergeResourcesQuestionQuery.setQuestionStatus(1); + List questionList = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(teacherOpenCourseMergeResourcesQuestionQuery); + data.put("subjectNum", questionList.size()); + + TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery(); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseId(teacherOpenCourseId); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1); - List courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery); - List collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList()); - data.put("subjectNum", collect1.size()); + //List collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList()); + //案例 TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery = new TeacherOpenCourseHandsOnQuery(); teacherOpenCourseHandsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId); @@ -459,13 +502,13 @@ public class StatisticalAnalysisService { List xList = new ArrayList<>(); List yList = new ArrayList<>(); - collect.forEach((x,y) -> { + collect.forEach((x, y) -> { xList.add(x); yList.add(y); }); Map map = new HashMap<>(); - map.put("xList" , xList); - map.put("yList" , yList); + map.put("xList", xList); + map.put("yList", yList); return map; } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java index 4ab9936c..8ec8af99 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java @@ -720,25 +720,6 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService courseInfoList, - @NotEmpty(message = "ID对不能为空!") Map somecourseInfoIdPair) { - for (CourseInfo courseInfo : courseInfoList) { - somecourseInfoIdPair.forEach((oldId, newId) -> { - if (courseInfo.getCourseInfoId().equals(oldId)) { - courseInfo.setCourseInfoId(newId); - } - if (courseInfo.getCourseInfoParentId().equals(oldId)) { - courseInfo.setCourseInfoParentId(newId); - } - }); - } - } /** * 修改章节点的父类ID字段 @@ -755,14 +736,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService { - // if (courseInfo.getTeacherOpenCourseMergeCourseInfoId().equals(oldId)) { - // courseInfo.setTeacherOpenCourseMergeCourseInfoId(newId); - // } - // if (courseInfo.getCourseInfoParentId().equals(oldId)) { - // courseInfo.setCourseInfoParentId(newId); - // } - //}); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java index 33026eb2..312ca84c 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java @@ -372,7 +372,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService implements DeleteResourcesBy{ +public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseService implements DeleteResourcesBy { - @Autowired private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao; - @Autowired private TeacherOpenCourseStudentSigninLogDao teacherOpenCourseStudentSigninLogDao; - @Autowired private TeacherOpenCourseStudentSigninSettingQueryValidator settingQueryValidator; + @Autowired + private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao; + @Autowired + private TeacherOpenCourseStudentSigninLogDao teacherOpenCourseStudentSigninLogDao; + @Autowired + private TeacherOpenCourseStudentSigninSettingQueryValidator settingQueryValidator; - public PageQueryqueryByCondition(PageQuery query){ - PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByCondition(query); + public PageQuery queryByCondition(PageQuery query) { + PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByCondition(query); queryListAfter(ret.getList()); // setSummaryInfo(ret.getList()); return ret; @@ -59,6 +63,7 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic /** * 根据签到ID,设置汇总数据 + * * @param list */ private void setSummaryInfo(List list) { @@ -82,24 +87,24 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic } } - public PageQueryqueryByConditionQuery(PageQuery query){ - PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByConditionQuery(query); + public PageQuery queryByConditionQuery(PageQuery query) { + PageQuery ret = teacherOpenCourseStudentSigninSettingDao.queryByConditionQuery(query); queryListAfter(ret.getList()); return ret; } - public void deleteByList(List list){ + public void deleteByList(List list) { String ids = ""; ToolUtils.deleteNullList(list); - for(int i=0;null != list && i teacherOpenCourseStudentSigninSettingList = new ArrayList<>(); try { @@ -115,11 +120,12 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic } catch (Exception e) { try { teacherOpenCourseStudentSigninSettingList.add(JSONObject.parseObject(teacherOpenCourseStudentSigninSettingQuery.getTeacherOpenCourseStudentSigninSettingJsonStr(), TeacherOpenCourseStudentSigninSetting.class)); - } catch (Exception e1) {} + } catch (Exception e1) { + } } ToolUtils.deleteNullList(teacherOpenCourseStudentSigninSettingList); - if(null != teacherOpenCourseStudentSigninSettingList && teacherOpenCourseStudentSigninSettingList.size()>0){ - for(int i=0;i 0) { + for (int i = 0; i < teacherOpenCourseStudentSigninSettingList.size(); i++) { TeacherOpenCourseStudentSigninSetting teacherOpenCourseStudentSigninSetting = teacherOpenCourseStudentSigninSettingList.get(i); teacherOpenCourseStudentSigninSetting.setUserId(teacherOpenCourseStudentSigninSettingQuery.getUserId()); teacherOpenCourseStudentSigninSetting.setOrgId(teacherOpenCourseStudentSigninSettingQuery.getOrgId()); @@ -136,6 +142,17 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingAddTime(new Date()); // 默认是未开始的状态 teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.READY); + //获取现在时间 只保留到分钟 + Date now = new Date(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + String nowTime = dateFormat.format(now); + try { + now = dateFormat.parse(nowTime); + }catch (Exception e){ + throw new PlatformException("时间转换异常", e); + } + + teacherOpenCourseStudentSigninSetting.setTeacherOpenCourseStudentSigninSettingSessionTime(now); teacherOpenCourseStudentSigninSettingDao.insert(teacherOpenCourseStudentSigninSetting); teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingId(teacherOpenCourseStudentSigninSetting.getTeacherOpenCourseStudentSigninSettingId()); JsonResult jsonResult = new JsonResult(); @@ -145,35 +162,35 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic return jsonResult; } - public String edit(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ + public String edit(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) { String msg = ""; TeacherOpenCourseStudentSigninSetting teacherOpenCourseStudentSigninSetting = teacherOpenCourseStudentSigninSettingQuery.pojo(); teacherOpenCourseStudentSigninSettingDao.updateTemplateById(teacherOpenCourseStudentSigninSetting); return msg; } - public String updateGivenByIds(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ + public String updateGivenByIds(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) { String msg = ""; - if(StringUtils.isNotBlank(teacherOpenCourseStudentSigninSettingQuery.get_given())){ + if (StringUtils.isNotBlank(teacherOpenCourseStudentSigninSettingQuery.get_given())) { boolean flag = teacherOpenCourseStudentSigninSettingDao.updateGivenByIds(teacherOpenCourseStudentSigninSettingQuery) > 0; - if(!flag){ + if (!flag) { msg = "更新指定参数失败"; } - }else{ + } else { msg = "指定参数为空"; } return msg; } - public List getValues (Object paras){ + public List getValues(Object paras) { return sqlManager.select(SqlId.of("jlw.teacherOpenCourseStudentSigninSetting.getTeacherOpenCourseStudentSigninSettingValues"), TeacherOpenCourseStudentSigninSetting.class, paras); } - public List getValuesByQuery (TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ + public List getValuesByQuery(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) { return teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery); } - public List getValuesByQueryNotWithPermission (TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ + public List getValuesByQueryNotWithPermission(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) { return teacherOpenCourseStudentSigninSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseStudentSigninSettingQuery); } @@ -181,35 +198,36 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic dictParser(obj); } - public TeacherOpenCourseStudentSigninSetting getInfo (Long teacherOpenCourseStudentSigninSettingId){ + public TeacherOpenCourseStudentSigninSetting getInfo(Long teacherOpenCourseStudentSigninSettingId) { TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery = new TeacherOpenCourseStudentSigninSettingQuery(); teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingId(teacherOpenCourseStudentSigninSettingId); teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingStatusPlural("1,2");//需要根据实际情况来 List list = teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery); - if(null != list && list.size()>0){ + if (null != list && list.size() > 0) { return list.get(0); - }else{ + } else { return null; } } - public TeacherOpenCourseStudentSigninSetting getInfo (TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){ + public TeacherOpenCourseStudentSigninSetting getInfo(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery) { List list = teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery); - if(null != list && list.size()>0){ + if (null != list && list.size() > 0) { return list.get(0); - }else{ + } else { return null; } } /** * 设置签到配置的状态 开始,结束 + * * @param id * @param status */ public void updateStatus(@NotNull(message = "签到配置ID不能为空!") Long id, @NotNull(message = "签到状态不能为空!") - Integer status) { + Integer status) { TeacherOpenCourseStudentSigninSetting model = new TeacherOpenCourseStudentSigninSetting(); model.setTeacherOpenCourseStudentSigninSettingId(id); @@ -226,17 +244,19 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic settingQuery.set_given( "teacherOpenCourseStudentSigninSettingAddTime," + - "teacherOpenCourseStudentSigninSettingEndTime," + - "teacherOpenCourseStudentSigninSettingStartStatus"); + "teacherOpenCourseStudentSigninSettingEndTime," + + "teacherOpenCourseStudentSigninSettingStartStatus"); updateGivenByIds(settingQuery); - } break; + } + break; case 2: { // 结束时间,赋值 model.setTeacherOpenCourseStudentSigninSettingEndTime(new Date()); model.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.END); updateTemplate(model); - } break; + } + break; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java b/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java index ac5d0853..17148806 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java @@ -45,7 +45,6 @@ public class StatisticalAnalysisController { /** * 首页数据 - * @param map * @return */ @RequestMapping("/indexDetail.do")