导出

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateDTO.java

@@ -190,6 +190,9 @@ public class EvaluateDTO implements Serializable {
 
     private List<EvaluateReplyDTO> replyList;
     private boolean hasTopHot;
+    private String replyTime;
+    private String replyMemberContent;
+    private String replyUserContent;
 
     public Integer getEvaluateId() {
         return evaluateId;
@@ -486,4 +489,28 @@ public class EvaluateDTO implements Serializable {
     public boolean getHasTopHot() {
         return hasTopHot;
     }
+
+    public void setReplyTime(String replyTime) {
+        this.replyTime = replyTime;
+    }
+
+    public String getReplyTime() {
+        return replyTime;
+    }
+
+    public void setReplyMemberContent(String replyMemberContent) {
+        this.replyMemberContent = replyMemberContent;
+    }
+
+    public String getReplyMemberContent() {
+        return replyMemberContent;
+    }
+
+    public void setReplyUserContent(String replyUserContent) {
+        this.replyUserContent = replyUserContent;
+    }
+
+    public String getReplyUserContent() {
+        return replyUserContent;
+    }
 }

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateExportController.java

@@ -124,12 +124,38 @@ public class EvaluateExportController extends DownloadUtils {
                                         .filter(e -> ReplyerTypeEnum.MEMBER.getCode().equals(e.getReplyerType()))
                                         .map(e -> simpleDateFormat.format(e.getReplyDate()))
                                         .collect(Collectors.toList());
-
+                                StringBuilder sb = new StringBuilder();
+                                for (int i = 0; i < replyDateList.size(); i++) {
+                                    sb.append("(").append(i + 1).append(")").append(replyDateList.get(i)).append("     ");
+                                }
+                                evaluateDTO.setReplyTime(sb.toString());
                             }
-
                             // todo 追评内容
-
+                            if (hasReplyMemberContent) {
+                                List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
+                                List<String> replyMemberContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
+                                        .filter(e -> ReplyerTypeEnum.MEMBER.getCode().equals(e.getReplyerType()))
+                                        .map(e -> simpleDateFormat.format(e.getReplyContent()))
+                                        .collect(Collectors.toList());
+                                StringBuilder sb = new StringBuilder();
+                                for (int i = 0; i < replyMemberContentList.size(); i++) {
+                                    sb.append("(").append(i + 1).append(")").append(replyMemberContentList.get(i)).append("     ");
+                                }
+                                evaluateDTO.setReplyMemberContent(sb.toString());
+                            }
                             // todo 商家回复
+                            if (hasReplyMemberContent) {
+                                List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
+                                List<String> replyUserContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
+                                        .filter(e -> ReplyerTypeEnum.USER.getCode().equals(e.getReplyerType()))
+                                        .map(e -> simpleDateFormat.format(e.getReplyContent()))
+                                        .collect(Collectors.toList());
+                                StringBuilder sb = new StringBuilder();
+                                for (int i = 0; i < replyUserContentList.size(); i++) {
+                                    sb.append("(").append(i + 1).append(")").append(replyUserContentList.get(i)).append("     ");
+                                }
+                                evaluateDTO.setReplyUserContent(sb.toString());
+                            }
                         }
                     }