Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -145,6 +145,7 @@ public class StudentManageController extends BaseController {
     @PostMapping("sysSuggestion/queryPage")
     public Object queryPage(@RequestBody SysSuggestionQueryInfo queryInfo) {
         queryInfo.setUserId(sysUserService.getUserId());
+        queryInfo.setClientType("STUDENT");
         return succeed(suggestionService.queryPage(queryInfo));
     }
 

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -109,6 +109,7 @@ public class TeacherManageController extends BaseController {
     @PostMapping("sysSuggestion/queryPage")
     public Object queryPage(@RequestBody SysSuggestionQueryInfo queryInfo) {
         queryInfo.setUserId(sysUserService.getUserId());
+        queryInfo.setClientType("TEACHER");
         return succeed(suggestionService.queryPage(queryInfo));
     }
 

mec-application/src/main/java/com/ym/mec/web/controller/SysSuggestionTypeController.java

@@ -3,18 +3,14 @@ package com.ym.mec.web.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SysSuggestionDao;
-import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.entity.SysSuggestionType;
-import com.ym.mec.biz.dal.entity.TempLittleArtistTrainingCamp;
-import com.ym.mec.biz.dal.page.SysSuggestionQueryInfo;
-import com.ym.mec.biz.service.SysSuggestionService;
 import com.ym.mec.biz.service.SysSuggestionTypeService;
 import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.page.QueryInfo;

mec-application/src/main/java/com/ym/mec/web/controller/school/SchoolSysSuggestionController.java

@@ -39,6 +39,7 @@ public class SchoolSysSuggestionController extends BaseController {
     @ApiOperation(value = "分页查询")
     @PostMapping("/queryPage")
     public Object queryPage(@RequestBody SysSuggestionQueryInfo queryInfo) {
+        queryInfo.setClientType("SCHOOL");
         queryInfo.setUserId(sysUserService.getUserId());
         return succeed(suggestionService.queryPage(queryInfo));
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -5978,7 +5978,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			vo.setCourseStatus(courseStatus);
 			List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDto> currentWeekDates = new ArrayList<>();
 			for (DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDto dto : summary) {
-				if (!dto.getCourseDate().isBefore(currentWeekStart) && dto.getCourseDate().isBefore(currentWeekEnd)) {
+				if (!dto.getCourseDate().isBefore(currentWeekStart) && !dto.getCourseDate().isAfter(currentWeekEnd)) {
 					currentWeekDates.add(dto);
 				}
 			}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -1201,7 +1201,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		queryInfo.setStartTerm(startTerm);
 		queryInfo.setEndTerm(endTerm);
 		queryInfo.setMusicGroupIds(musicGroupIds);
-		queryInfo.setClassGroupId(queryInfo.getClassGroupId());
 		List<TeacherAttendanceSumDto> dtoList = teacherAttendanceDao.queryTeacherAttendance(queryInfo);
 		if(CollectionUtils.isNotEmpty(dtoList)){
 			//获取本周老师考勤状态

mec-util/src/main/java/com/ym/mec/util/date/DateUtil.java

@@ -1306,11 +1306,13 @@ public class DateUtil {
     public static String getEndTerm(Date date) {
 		//一个学期默认为6个月，9月1日—2月28、29日，3月1日—8月31日
 		Integer month = Integer.parseInt(DateUtil.getMonth(date));
-		String year = DateUtil.getYear(date);
 		if(month >= 9 || month <= 2){
-			return year + "-02-01";
+			if(month >= 9){
+				return DateUtil.getYear(DateUtil.addYears(date,1)) + "-02-29";
+			}
+			return DateUtil.getYear(date)+ "-02-29";
 		}else {
-			return year + "-08-31";
+			return DateUtil.getYear(date) + "-08-31";
 		}
     }