|
@@ -8,6 +8,7 @@ import com.github.zuihou.business.classSchedule.dto.ScheduleUserDatePageDTO;
|
|
|
import com.github.zuihou.business.classSchedule.service.ScheduleUserDateService;
|
|
|
|
|
|
import java.time.LocalDate;
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -121,7 +122,7 @@ public class ScheduleUserDateController extends SuperController<ScheduleUserDate
|
|
|
ScheduleUserDate scheduleUserDate = baseService.getById(1L);
|
|
|
//本地默认班组数据
|
|
|
boolean bool = scheduleUserDate.getStartTime()!=null && scheduleUserDate.getEndTime()!=null && scheduleUserDate.getMonthId()!=null && scheduleUserDate.getMonthId() != scheduleUserDate.getOrderId();
|
|
|
- if(bool || (LocalDate.now().isAfter(scheduleUserDate.getCreateTime().toLocalDate()) && scheduleUserDate.getMonthId()!=null)){
|
|
|
+ if(bool || (LocalDate.now().isAfter(scheduleUserDate.getUpdateTime().toLocalDate()) && scheduleUserDate.getMonthId()!=null)){
|
|
|
scheduleUserDate.setStartTime(null).setEndTime(null).setMonthId(null);
|
|
|
baseService.updateAllById(scheduleUserDate);
|
|
|
}
|
|
@@ -148,8 +149,10 @@ public class ScheduleUserDateController extends SuperController<ScheduleUserDate
|
|
|
if(scheduleUserDateUpdateDTO.getId() == null || scheduleUserDateUpdateDTO.getOrderId() == null) return fail("传参错误");
|
|
|
ScheduleUserDate scheduleUserDate = baseService.getById(scheduleUserDateUpdateDTO.getId());
|
|
|
|
|
|
+ scheduleUserDate.setUpdateTime(LocalDateTime.now());
|
|
|
if(scheduleUserDateUpdateDTO.isOnWork()){
|
|
|
scheduleUserDate.setStartTime(new Date());
|
|
|
+
|
|
|
}else{
|
|
|
scheduleUserDate.setEndTime(new Date());
|
|
|
}
|