Merge branch 'master' of http://dev.xinyingpower.com:8080/git/xymp/backend

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

@@ -498,17 +498,25 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
             if (null != resultObj.get("groupData")) {
                 List<PhotoTimeResultDto> resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class);
                 if (CollectionUtil.isNotEmpty(resultDtoList)) {
+                    int group = Integer.parseInt(resultObj.get("group").toString());
+                    int toIndex = 3;
                     List<String> resultList = Lists.newArrayList();
-                    String startTimeStr = resultDtoList.get(0).getHour() + ":" + resultDtoList.get(0).getMinute() + ":00";
+                    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 = resultDtoList.get(2).getHour() + ":" + resultDtoList.get(2).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(2).getHour() * 60 + resultDtoList.get(2).getMinute();
+                            Integer span = resultDtoList.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);
                 }