From 819b0c649de7d2524a496ae9fe0ddba0c8b1cfc0 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Mon, 29 May 2023 19:46:37 +0800 Subject: [PATCH] =?UTF-8?q?#20230529=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TerminalScheduleRuleServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java index 6510684..7ae12e5 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java @@ -516,19 +516,18 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ List resultList = Lists.newArrayList(); for (int i = 0; i < (group / toIndex); i++) { List 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"; + String startTimeStr = newList.get(2).getHour() + ":" + resultDtoList.get(2).getMinute() + ":00"; + String endTimeStr = newList.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 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);