diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java index d2a3efec16..046a2c6854 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java @@ -304,4 +304,17 @@ public class ResiActListController { return actUserRelationService.registration(tokenDto, formDTO); } + /** + * 首页组件 - 活动回顾列表(包含状态:已结束:finished;) + * + * @param formDto + * @return com.epmet.commons.tools.utils.Result> + * @Author zhangyong + * @Date 13:39 2020-07-21 + **/ + @PostMapping("actlookbackassembly") + public Result> actLookBackAssembly(@RequestBody ResiLatestActFormDTO formDto) { + ValidatorUtils.validateEntity(formDto, ResiActBaseFormDTO.AddUserInternalGroup.class); + return actInfoService.actLookBackAssembly(formDto); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java index ce0d39cb16..e27d70b442 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java @@ -297,4 +297,16 @@ public interface ActInfoDao extends BaseDao { * @Date 2020/7/26 21:35 **/ InProgressActDetailResultDTO selectInProgressDetail(String actId); + + /** + * 首页组件 - 活动回顾列表(包含状态:已结束:finished;) + * 已结束的活动,并且有实况或有回顾 + * 按照时间顺序排序 + * + * @param formDTO + * @return java.util.List + * @Author zhangyong + * @Date 11:00 2020-07-20 + **/ + List selectListLookBackActAssembly(ResiLatestActFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java index 26a868572b..7fc4eb4963 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java @@ -225,4 +225,14 @@ public interface ActInfoService extends BaseService { * @Date 17:17 2020-07-23 **/ Integer checkActTime(ActInfoDTO actInfoDTO); + + /** + * 首页组件 - 活动回顾列表(包含状态:已结束:finished;) + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @Author zhangyong + * @Date 13:39 2020-07-21 + **/ + Result> actLookBackAssembly(ResiLatestActFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java index f7b0da4e16..3afeddf4bb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java @@ -379,4 +379,10 @@ public class ActInfoServiceImpl extends BaseServiceImpl> actLookBackAssembly(ResiLatestActFormDTO formDTO) { + List lookBackAct = baseDao.selectListLookBackActAssembly(formDTO); + return new Result>().ok(lookBackAct); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 2c0bff8748..891cde8f20 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -330,7 +330,7 @@ + + +