Skip to content

G
gic-evaluate
Commit b06f2f47 by zhiwj
Options

导出bug

parent 92c4abc4
Showing with 2 additions and 3 deletions
gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateExportController.java
...@@ -8,7 +8,6 @@ import com.gic.download.utils.DataDownloadUtils; ...@@ -8,7 +8,6 @@ import com.gic.download.utils.DataDownloadUtils;
import com.gic.download.utils.DownloadReport; import com.gic.download.utils.DownloadReport;
import com.gic.download.utils.DownloadUtils; import com.gic.download.utils.DownloadUtils;
import com.gic.download.utils.ExecutorPoolSingleton; import com.gic.download.utils.ExecutorPoolSingleton;
import com.gic.enterprise.context.RequestContext;
import com.gic.enterprise.utils.UserDetailUtils; import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.evaluate.constant.ReplyerTypeEnum; import com.gic.evaluate.constant.ReplyerTypeEnum;
import com.gic.evaluate.dto.EvaluateDTO; import com.gic.evaluate.dto.EvaluateDTO;
...@@ -140,7 +139,7 @@ public class EvaluateExportController extends DownloadUtils { ...@@ -140,7 +139,7 @@ public class EvaluateExportController extends DownloadUtils {
List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList(); List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
List<String> replyMemberContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream() List<String> replyMemberContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
.filter(e -> ReplyerTypeEnum.MEMBER.getCode().equals(e.getReplyerType())) .filter(e -> ReplyerTypeEnum.MEMBER.getCode().equals(e.getReplyerType()))
.map(e -> simpleDateFormat.format(e.getReplyContent())) .map(EvaluateReplyDTO::getReplyContent)
.collect(Collectors.toList()); .collect(Collectors.toList());
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (int i = 0; i < replyMemberContentList.size(); i++) { for (int i = 0; i < replyMemberContentList.size(); i++) {
...@@ -153,7 +152,7 @@ public class EvaluateExportController extends DownloadUtils { ...@@ -153,7 +152,7 @@ public class EvaluateExportController extends DownloadUtils {
List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList(); List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
List<String> replyUserContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream() List<String> replyUserContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
.filter(e -> ReplyerTypeEnum.USER.getCode().equals(e.getReplyerType())) .filter(e -> ReplyerTypeEnum.USER.getCode().equals(e.getReplyerType()))
.map(e -> simpleDateFormat.format(e.getReplyContent())) .map(EvaluateReplyDTO::getReplyContent)
.collect(Collectors.toList()); .collect(Collectors.toList());
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (int i = 0; i < replyUserContentList.size(); i++) { for (int i = 0; i < replyUserContentList.size(); i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment