diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java index 78ffbf31..4afdfdbc 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java @@ -132,4 +132,9 @@ public class ActUserRelationResultDTO implements Serializable { * 活动详细时间段 */ private List periods; + + /** + * 活动详细时间段拼接字符串 + */ + private String actPeriodStr; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java index ac5f97e2..33388888 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java @@ -17,10 +17,13 @@ package com.elink.esua.epdc.modules.activity.controller; +import cn.hutool.core.collection.CollectionUtil; +import com.elink.esua.epdc.activity.ActPeriodDTO; import com.elink.esua.epdc.activity.ActUserRelationDTO; import com.elink.esua.epdc.activity.form.ActUserRelationAuditFormDTO; import com.elink.esua.epdc.activity.result.ActUserRelationResultDTO; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; @@ -138,6 +141,22 @@ public class ActUserRelationController { } else if ("6".equals(sourceList.get(i).getStatus())){ sourceList.get(i).setStatus("拒绝加积分"); } + + List periods = sourceList.get(i).getPeriods(); + if (CollectionUtil.isNotEmpty(periods)) { + StringBuilder stringBuilder = new StringBuilder(); + for (int j=0; j