修改bug

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

@@ -117,9 +117,10 @@ public class EvaluateExportController extends DownloadUtils {
                     boolean hasReplyMemberContent = fieldCodeList.contains("replyMemberContent");
                     boolean hasReplyUserContent = fieldCodeList.contains("replyUserContent");
                     if (CollectionUtils.isNotEmpty(result.getResult().getResult())) {
-                        for(EvaluateDTO evaluateDTO : result.getResult().getResult()) {
+                        for(EvaluateDTO resultDTO : result.getResult().getResult()) {
+                            EvaluateDTO evaluateDTO = null;
                             if (hasReplyTime || hasReplyMemberContent || hasReplyUserContent) {
-                                evaluateDTO = evaluateManageApiService.getEvaluate(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId()).getResult();
+                                evaluateDTO = evaluateManageApiService.getEvaluate(resultDTO.getEnterpriseId(), resultDTO.getEvaluateId()).getResult();
                             }
                             // 追评时间
                             if (hasReplyTime) {
@@ -132,7 +133,7 @@ public class EvaluateExportController extends DownloadUtils {
                                 for (int i = 0; i < replyDateList.size(); i++) {
                                     sb.append("(").append(i + 1).append(")").append(replyDateList.get(i)).append("     ");
                                 }
-                                evaluateDTO.setReplyTime(sb.toString());
+                                resultDTO.setReplyTime(sb.toString());
                             }
                             // 追评内容
                             if (hasReplyMemberContent) {
@@ -145,7 +146,7 @@ public class EvaluateExportController extends DownloadUtils {
                                 for (int i = 0; i < replyMemberContentList.size(); i++) {
                                     sb.append("(").append(i + 1).append(")").append(replyMemberContentList.get(i)).append("     ");
                                 }
-                                evaluateDTO.setReplyMemberContent(sb.toString());
+                                resultDTO.setReplyMemberContent(sb.toString());
                             }
                             // 商家回复
                             if (hasReplyUserContent) {
@@ -158,7 +159,7 @@ public class EvaluateExportController extends DownloadUtils {
                                 for (int i = 0; i < replyUserContentList.size(); i++) {
                                     sb.append("(").append(i + 1).append(")").append(replyUserContentList.get(i)).append("     ");
                                 }
-                                evaluateDTO.setReplyUserContent(sb.toString());
+                                resultDTO.setReplyUserContent(sb.toString());
                             }
                         }
                     }

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

@@ -112,29 +112,36 @@ public class ProblemExportController extends DownloadUtils {
                     problemQO.setPageSize(1000);
                     ServiceResponse<Page<ProblemDTO>> result = problemManageApiService.listProblem(problemQO);
                     boolean hasReplyUserContent = fieldCodeList.contains("replyUserContent");
-                    if (CollectionUtils.isNotEmpty(result.getResult().getResult())) {
-                        for(ProblemDTO problemDTO : result.getResult().getResult()) {
+                    List<ProblemDTO> resultList = result.getResult().getResult();
+                    if (CollectionUtils.isNotEmpty(resultList)) {
+                        for(ProblemDTO resultDTO : resultList) {
                             if (hasReplyUserContent) {
-                                problemDTO = problemManageApiService.getProblem(problemDTO.getProblemId()).getResult();
+                                ProblemDTO problemDTO = problemManageApiService.getProblem(resultDTO.getProblemId()).getResult();
 
                                 List<ProblemReplyDTO> replyList = problemDTO.getReplyList();
-                                List<String> replyUserContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
-                                        .filter(e -> ReplyerTypeEnum.USER.getCode().equals(e.getReplyerType()))
-                                        .map(ProblemReplyDTO::getReplyContent)
-                                        .collect(Collectors.toList());
+//                                List<String> replyUserContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
+//                                        .filter(e -> ReplyerTypeEnum.USER.getCode().equals(e.getReplyerType()))
+//                                        .map(ProblemReplyDTO::getReplyContent)
+//                                        .collect(Collectors.toList());
+                                int j = 0;
                                 StringBuilder sb = new StringBuilder();
-                                for (int i = 0; i < replyUserContentList.size(); i++) {
-                                    sb.append("(").append(i + 1).append(")").append(replyUserContentList.get(i)).append("     ");
+                                for (ProblemReplyDTO problemReplyDTO : replyList) {
+                                    if (ReplyerTypeEnum.USER.getCode().equals(problemReplyDTO.getReplyerType())) {
+                                        j++;
+                                    }
+                                    sb.append("(").append(j).append(")").append(problemReplyDTO.getReplyContent()).append("     ");
                                 }
-                                problemDTO.setReplyUserContent(sb.toString());
+                                resultDTO.setReplyUserContent(sb.toString());
+
                             }
                         }
                     }
 
-                    return result.getResult().getResult();
+                    return resultList;
                 }
             };
             try {
+
                 //参数说明：excelExtensionCode，Excel后缀名code ，枚举类：ExcelExtensionEnum, Arrays.asList("phone")这个phone是需要加密的字段
                 download(path, reportId, exportQO.getFileName(), exportQO.getExcelExtension(), fieldNameList, fieldCodeList, loader, Arrays.asList("memberPhone"), null);
             } catch (Exception e) {