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 765f6743..47b689c9 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 @@ -52,8 +52,28 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ public boolean insertDomain(XhpcActivityInternetDomain domain) { internetMapper.insert(domain); + List formulaDomainList = getFormulaFullList(domain); + formulaMapper.insertBatch(formulaDomainList); + return true; + } + + + @Override + public boolean updateDomain(XhpcActivityInternetDomain domain) { + internetMapper.updateByPrimaryKey(domain); + formulaMapper.deleteByActivityId(domain.getActivityId()); + + List formulaDomainList = getFormulaFullList(domain); + formulaMapper.insertBatch(formulaDomainList); + return true; + } + + + + private List getFormulaFullList(XhpcActivityInternetDomain domain){ + boolean isFullDay = false; - Integer index = 0; + int index = 0; List formulaDomainList = domain.getFormulaList(); List formulaDomains = new ArrayList<>(); String startTime = "00:00:00", endTime="24:00:00"; @@ -102,26 +122,8 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ } } + return formulaDomains; - formulaMapper.insertBatch(formulaDomains); - return true; - } - - - @Override - public boolean updateDomain(XhpcActivityInternetDomain domain) { - internetMapper.updateByPrimaryKey(domain); - formulaMapper.deleteByActivityId(domain.getActivityId()); - - for (XhpcActivityFormulaDomain formulaDomain : domain.getFormulaList()) { - formulaDomain.setActivityId(domain.getActivityId()); - formulaDomain.setCreateBy(domain.getCreateBy()); - formulaDomain.setUpdateBy(domain.getUpdateBy()); - formulaMapper.insert(formulaDomain); - } - - - return true; }