diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityInfoServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityInfoServiceImpl.java index 1cb847b..6d112a4 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityInfoServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityInfoServiceImpl.java @@ -26,11 +26,6 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.smile.dto.activity.ActivityInfoDTO; -import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO; -import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO; -import com.elink.esua.epdc.smile.dto.activity.result.ActivityDetailResultDTO; -import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO; import com.elink.esua.epdc.modules.smile.activity.dao.ActivityInfoDao; import com.elink.esua.epdc.modules.smile.activity.dao.ActivityParticipantDao; import com.elink.esua.epdc.modules.smile.activity.entity.ActivityInfoEntity; @@ -39,6 +34,11 @@ import com.elink.esua.epdc.modules.smile.activity.redis.ActivityInfoRedis; import com.elink.esua.epdc.modules.smile.activity.service.ActivityInfoService; import com.elink.esua.epdc.modules.smile.section.dao.SectionCategoryDao; import com.elink.esua.epdc.modules.smile.section.entity.SectionCategoryEntity; +import com.elink.esua.epdc.smile.dto.activity.ActivityInfoDTO; +import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO; +import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO; +import com.elink.esua.epdc.smile.dto.activity.result.ActivityDetailResultDTO; +import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -106,6 +107,7 @@ public class ActivityInfoServiceImpl extends BaseServiceImpl