|
@@ -256,15 +256,15 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
|
|
|
String year = DateUtil.getYear(startCourseDate);
|
|
|
if(month >= 9 || month <= 2){
|
|
|
if(month >= 9){
|
|
|
- courseDetail.setStartSchoolTerm(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(year + "-09-01 00:00:00")));
|
|
|
+ courseDetail.setStartSchoolTerm(DateUtil.stringToDate(year + "-09-01 00:00:00"));
|
|
|
year = DateUtil.getYear(DateUtil.addYears(startCourseDate, 1));
|
|
|
}else {
|
|
|
String year1 = DateUtil.getYear(DateUtil.addYears(startCourseDate, -1));
|
|
|
- courseDetail.setStartSchoolTerm(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(year1 + "-09-01 00:00:00")));
|
|
|
+ courseDetail.setStartSchoolTerm(DateUtil.stringToDate(year1 + "-09-01 00:00:00"));
|
|
|
}
|
|
|
courseDetail.setEndSchoolTerm(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(year + "-02-01 00:00:00")));
|
|
|
}else {
|
|
|
- courseDetail.setStartSchoolTerm(DateUtil.getLastDayOfMonth(DateUtil.stringToDate(year + "-03-01 00:00:00")));
|
|
|
+ courseDetail.setStartSchoolTerm(DateUtil.stringToDate(year + "-03-01 00:00:00"));
|
|
|
courseDetail.setEndSchoolTerm(DateUtil.stringToDate(year + "-08-31 00:00:00"));
|
|
|
}
|
|
|
// courseDetail.setStartSchoolTerm(startCourseDate);
|