Merge remote-tracking branch 'origin/master' into dev

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java

@@ -516,19 +516,18 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
                         List<String> resultList = Lists.newArrayList();
                         for (int i = 0; i < (group / toIndex); i++) {
                             List<PhotoTimeResultDto> newList = resultDtoList.subList(i, i + toIndex);
-                            for (int i1 = 0; i1 < newList.size(); i1++) {
+                                String startTimeStr = newList.get(2).getHour() + ":" + resultDtoList.get(2).getMinute() + ":00";
-                                String startTimeStr = resultDtoList.get(2).getHour() + ":" + resultDtoList.get(2).getMinute() + ":00";
+                                String endTimeStr = newList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00";
-                                String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00";
                                 Date startTime = DateUtil.parseTime(startTimeStr);
                                 Date endTime = DateUtil.parseTime(endTimeStr);
-                                Integer span = resultDtoList.get(0).getHour() * 60 + resultDtoList.get(0).getMinute();
+                                Integer span = newList.get(0).getHour() * 60 + resultDtoList.get(0).getMinute();
                                 List<DateTime> dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
                                 for (DateTime data : dateTimes) {
                                     String dateTime = DateUtil.formatTime(data);
                                     resultList.add(dateTime);
                                 }
 
-                            }
+
                         }
                         model.setList(resultList);
                         model.setIsNew(true);