diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActInfoDTO.java index c4bbb1f100..fc921fdb7e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActInfoDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActInfoDTO.java @@ -53,4 +53,27 @@ public class UserHistoricalActInfoDTO implements Serializable { * 已处理: handled; 默认"",重新处理时reward_flag置为空字符串 */ private String processFlag; + + + // 新增以下参数 + /** + * 活动状态( + 已发布/报名中:published; + 已取消:canceled; + 已结束:finished) + */ + private String actStatus; + + /** + * 当前状态(已报名/待审核auditing, + 审核通过passed, + 审核不通过refused + 取消报名canceled, + ) + */ + private String userActStatus; + /** + * true已签到、false未签到 + */ + private Boolean signInFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index c31ad005a6..4efe296e17 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -359,7 +359,11 @@ public class WorkActUserServiceImpl implements WorkActUserService { resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum()); resultDTO.setObtainPointsActNum(historicalActInfo.getObtainPointsActNum()); //历史活动列表 - resultDTO.setActInfoList(actUserRelationDao.selectAllByUserId(formDTO.getUserId())); + List actInfoList=actUserRelationDao.selectAllByUserId(formDTO.getUserId()); + for(UserHistoricalActInfoDTO userHistoricalActInfoDTO:actInfoList){ + + } + resultDTO.setActInfoList(actInfoList); return resultDTO; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml index e6ddb723fc..343f3babd3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml @@ -138,7 +138,7 @@