|
@@ -181,9 +181,9 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
|
|
|
Date startTime = nowDate;
|
|
|
Date endTime = DateUtil.addDays(DateUtil.addYears(nowDate, 1), -1);
|
|
|
if (studentInstrument.getEndTime() != null &&
|
|
|
- DateUtil.getLastTimeWithDay(studentInstrument.getEndTime()).compareTo(nowDate) >= 0) {
|
|
|
+ studentInstrument.getEndTime().compareTo(nowDate) >= 0) {
|
|
|
startTime = studentInstrument.getStartTime();
|
|
|
- endTime = DateUtil.addDays(DateUtil.addYears(studentInstrument.getStartTime(), 1), -1);
|
|
|
+ endTime = DateUtil.addDays(DateUtil.addYears(studentInstrument.getEndTime(), 1), -1);
|
|
|
}
|
|
|
studentInstrument.setStartTime(startTime);
|
|
|
studentInstrument.setEndTime(endTime);
|