导出修改

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatActivityDataController.java

@@ -384,7 +384,7 @@ public class GroupChatActivityDataController {
         fieldList.add("groupChatId");
         indexList.add("加入群聊ID");
 
-        fieldList.add("joinGroupChatTime");
+        fieldList.add("joinGroupChatTimeDesc");
         indexList.add("入群时间");
 
         task.setFileName("社群邀请有礼-" + groupChatActivityDTO.getActivityName() + "-邀请明细");
@@ -497,7 +497,7 @@ public class GroupChatActivityDataController {
             indexList.add("奖励卡券");
         }
 
-        fieldList.add("createTime");
+        fieldList.add("rewardTimeDesc");
         indexList.add("发放时间");
 
         task.setFileName("社群邀请有礼-" + groupChatActivityDTO.getActivityName() + "-奖励明细");

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/handle/GroupChatActivityInviterHandle.java

 package com.gic.haoban.manage.web.handle;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -10,8 +11,6 @@ import com.gic.haoban.manage.web.controller.chat.GroupChatActivityDataController
 import com.gic.haoban.manage.web.qo.chat.GroupChatActivityInviteLogReq;
 import com.gic.haoban.manage.web.vo.chat.GroupChatActivityInviteLogExportVO;
 import com.gic.haoban.manage.web.vo.chat.GroupChatActivityInviteLogVO;
-import com.gic.haoban.manage.web.vo.chat.GroupChatActivityRewardLogExportVO;
-import com.gic.haoban.manage.web.vo.chat.GroupChatDataJoinDetailVO;
 import com.gic.web.common.download.DownloadHandlerAbstract;
 import com.gic.web.common.download.context.Context;
 import com.google.common.collect.Lists;
@@ -82,6 +81,10 @@ public class GroupChatActivityInviterHandle extends DownloadHandlerAbstract<Grou
                 }
             }
 
+            if(Objects.nonNull(groupChatActivityInviteLogVO.getCreateTime())){
+                groupChatActivityRewardLogExportVO.setJoinGroupChatTimeDesc(DateUtil.formatDateTime(groupChatActivityInviteLogVO.getCreateTime()));
+            }
+
             groupChatActivityInviteLogExportVOS.add(groupChatActivityRewardLogExportVO);
         }
         log.info("社群邀请有礼邀请明细数据导出={}", JSON.toJSONString(groupChatActivityInviteLogExportVOS));

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/handle/GroupChatActivityRewardHandle.java

 package com.gic.haoban.manage.web.handle;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
-import com.gic.commons.util.DateUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.security.DownloadReportDTO;
 import com.gic.haoban.manage.web.controller.chat.GroupChatActivityDataController;
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author shangfeng
@@ -53,9 +54,6 @@ public class GroupChatActivityRewardHandle extends DownloadHandlerAbstract<Group
             GroupChatActivityRewardLogExportVO groupChatActivityRewardLogExportVO = new GroupChatActivityRewardLogExportVO();
             BeanUtils.copyProperties(groupChatActivityRewardLogVO, groupChatActivityRewardLogExportVO);
 
-            groupChatActivityRewardLogExportVO.setRewardTime(DateUtil.datetimeToString(groupChatActivityRewardLogVO.getCreateTime()));
-            groupChatActivityRewardLogExportVO.setRewardTime(DateUtil.datetimeToString(groupChatActivityRewardLogVO.getCreateTime()));
-
             if (groupChatActivityRewardLogVO.getRewardInvite() == 1) {
                 groupChatActivityRewardLogExportVO.setInviteLevelType("邀请奖励");
                 groupChatActivityRewardLogExportVO.setInviteLevelType("达成第" + groupChatActivityRewardLogVO.getInviteLevel() + "阶梯邀请奖励");
@@ -63,6 +61,11 @@ public class GroupChatActivityRewardHandle extends DownloadHandlerAbstract<Group
                 groupChatActivityRewardLogExportVO.setInviteLevelType("受邀奖励");
                 groupChatActivityRewardLogExportVO.setInviteLevelType("受邀进群奖励");
             }
+
+            if (Objects.nonNull(groupChatActivityRewardLogVO.getCreateTime())) {
+                groupChatActivityRewardLogExportVO.setRewardTimeDesc(DateUtil.formatDateTime(groupChatActivityRewardLogVO.getCreateTime()));
+            }
+
             groupChatActivityRewardLogExportVOS.add(groupChatActivityRewardLogExportVO);
         }
         log.info("社群邀请有礼奖励明细数据导出={}", JSON.toJSONString(groupChatActivityRewardLogExportVOS));

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityInviteLogExportVO.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.gic.web.common.jsonSeralizer.PhoneNumberJsonSeralizer;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @author shangfeng
@@ -81,7 +80,7 @@ public class GroupChatActivityInviteLogExportVO implements Serializable {
     /**
      * 入群时间
      */
-    private String joinGroupChatTime;
+    private String joinGroupChatTimeDesc;
 
     public String getName() {
         return name;
@@ -179,11 +178,11 @@ public class GroupChatActivityInviteLogExportVO implements Serializable {
         this.addMemberTypeDesc = addMemberTypeDesc;
     }
 
-    public String getJoinGroupChatTime() {
-        return joinGroupChatTime;
+    public String getJoinGroupChatTimeDesc() {
+        return joinGroupChatTimeDesc;
     }
 
-    public void setJoinGroupChatTime(String joinGroupChatTime) {
-        this.joinGroupChatTime = joinGroupChatTime;
+    public void setJoinGroupChatTimeDesc(String joinGroupChatTimeDesc) {
+        this.joinGroupChatTimeDesc = joinGroupChatTimeDesc;
     }
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatActivityRewardLogExportVO.java

@@ -32,11 +32,6 @@ public class GroupChatActivityRewardLogExportVO implements Serializable {
     private String inviteLevelType;
 
     /**
-     * 奖励时间
-     */
-    private String rewardTime;
-
-    /**
      * 会员名称
      */
     private String name;
@@ -67,6 +62,11 @@ public class GroupChatActivityRewardLogExportVO implements Serializable {
      */
     private String cardInfo;
 
+    /**
+     * 奖励时间
+     */
+    private String rewardTimeDesc;
+
     public Integer getMemberDeleteFlag() {
         return memberDeleteFlag;
     }
@@ -91,14 +91,6 @@ public class GroupChatActivityRewardLogExportVO implements Serializable {
         this.inviteLevelType = inviteLevelType;
     }
 
-    public String getRewardTime() {
-        return rewardTime;
-    }
-
-    public void setRewardTime(String rewardTime) {
-        this.rewardTime = rewardTime;
-    }
-
     public String getName() {
         return name;
     }
@@ -146,4 +138,12 @@ public class GroupChatActivityRewardLogExportVO implements Serializable {
     public void setCardInfo(String cardInfo) {
         this.cardInfo = cardInfo;
     }
+
+    public String getRewardTimeDesc() {
+        return rewardTimeDesc;
+    }
+
+    public void setRewardTimeDesc(String rewardTimeDesc) {
+        this.rewardTimeDesc = rewardTimeDesc;
+    }
 }