diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java index e215de13..075f9bf1 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java @@ -85,6 +85,12 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ List formulaDomainList = domain.getFormulaList(); List formulaDomains = new ArrayList<>(); String startTime = "00:00", endTime="24:00"; + if (formulaDomainList.size() > 0){ + if (formulaDomainList.get(0).getStartTime().length() != 5){ + startTime = "00:00:00"; + endTime = "24:00:00"; + } + } while (!isFullDay) { if (formulaDomainList == null || formulaDomainList.size() < 1) { @@ -93,8 +99,8 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ formulaDomain.setPowerPrice(domain.getPowerPrice()); formulaDomain.setServicePrice(domain.getServicePrice()); formulaDomain.setComputeFormula(domain.getComputeFormula()); - formulaDomain.setStartTime("00:00"); - formulaDomain.setEndTime("24:00"); + formulaDomain.setStartTime(startTime); + formulaDomain.setEndTime(endTime); formulaDomain.setCreateBy(domain.getCreateBy()); formulaDomain.setUpdateBy(domain.getUpdateBy()); formulaDomains.add(formulaDomain);