【专题资讯导出添加字段】

src/main/java/com/zzsn/event/controller/FileController.java

@@ -462,12 +462,12 @@ public class FileController {
 
 
     private byte[] getBytes(InfoDataSearchCondition searchCondition, Integer pageSize) {
-        String[] fetchFields = new String[]{"id", "score", "title", "titleRaw", "summary", "summaryRaw", "content", "contentRaw", "author", "origin", "publishDate", "sourceAddress", "classificationType", "hitWords", "labels"};
+        String[] fetchFields = new String[]{"id", "score", "title", "titleRaw", "summary", "summaryRaw", "content", "contentRaw", "author", "origin", "publishDate", "sourceAddress", "classificationType", "hitWords", "labels","contentWithTag","contentWithTagRaw"};
         searchCondition.setFetchFields(fetchFields);
         searchCondition.setPageSize(pageSize);
         byte[] bytes = null;
         try {
-            String[] arr = new String[]{"id", "得分", "标题", "标题译文", "摘要", "摘要译文", "正文", "正文译文", "作者", "来源", "发布时间", "网址", "专题库类型", "命中词"};
+            String[] arr = new String[]{"id", "得分", "标题", "标题译文", "摘要", "摘要译文", "正文", "正文译文", "作者", "来源", "发布时间", "网址", "专题库类型", "命中词","带标签正文","带标签正文译文"};
             List<String> headers = Arrays.asList(arr);
             List<String> subjectIdList = new ArrayList<>();
             //判断是否是专题
@@ -618,6 +618,16 @@ public class FileController {
             } else {
                 data.add(" ");
             }
+            if (StringUtils.isNotEmpty(info.getContentWithTag())) {
+                data.add(info.getContentWithTag());
+            } else {
+                data.add(" ");
+            }
+            if (StringUtils.isNotEmpty(info.getContentWithTagRaw())) {
+                data.add(info.getContentWithTagRaw());
+            } else {
+                data.add(" ");
+            }
             if (subjectIdList.size() == 1 && (CollectionUtils.isNotEmpty(labelTypeVos))) {
                     List<Label> relationLabels = info.getLabels();
                     Map<String, List<Label>> map = new HashMap<>(labelTypeVos.size());