|
@@ -2222,16 +2222,17 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
@Override
|
|
|
public Map<Integer, List<String>> getEnableApplyDatesWithWeek() {
|
|
|
Map<Integer, List<String>> result = new HashMap<>();
|
|
|
- SysConfig practiceApplyStartTimeConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_APPLY_START_TIME);
|
|
|
- SysConfig practiceApplyEndTimeConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_APPLY_END_TIME);
|
|
|
SysConfig practiceApplyIntervalTimeConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_APPLY_INTERVAL_TIME);
|
|
|
Integer practiceApplyIntervalMinutes = practiceApplyIntervalTimeConfig.getParanValue(Integer.class);
|
|
|
- LocalTime dayStartTime=LocalTime.parse(practiceApplyStartTimeConfig.getParanValue(),DateUtil.timeFormatter);
|
|
|
- LocalTime dayEndTime=LocalTime.parse(practiceApplyEndTimeConfig.getParanValue(),DateUtil.timeFormatter);
|
|
|
+ LocalTime dayStartTime=LocalTime.parse("00:00:00",DateUtil.timeFormatter);
|
|
|
+ LocalTime dayEndTime=LocalTime.parse("00:00:00",DateUtil.timeFormatter);
|
|
|
List<String> dayApplyTimes=new ArrayList<>();
|
|
|
- while (dayEndTime.isAfter(dayStartTime)){
|
|
|
+ while (true){
|
|
|
dayApplyTimes.add(dayStartTime.format(DateUtil.timeFormatter));
|
|
|
dayStartTime=dayStartTime.plusMinutes(practiceApplyIntervalMinutes);
|
|
|
+ if(dayStartTime.compareTo(dayEndTime)==0){
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
for (int i = 1; i <= 7; i++) {
|
|
|
List<String> tempTimes = new ArrayList<>();
|