zero 1 mese fa
parent
commit
01e2199efd

+ 2 - 2
src/main/java/com/cslg/ppa/service/ReportService.java

@@ -352,7 +352,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                         for (SelectAssoReportArticleVO reportArticleVO : reportArticleVOS) {
                             ExportReportDetailVO detailVO = new ExportReportDetailVO();
                             detailVO.setTitle(i + "、" + reportArticleVO.getTitle());
-                            detailVO.setDigest(reportArticleVO.getDigest());
+                            detailVO.setDigest(reportArticleVO.getOldContent());
                             String htmlLink = "<a href='" + reportArticleVO.getArticleUrl() + "'>" + reportArticleVO.getArticleUrl() + "</a>";
                             detailVO.setArticle_url(htmlLink);
                             detailVOS.add(detailVO);
@@ -554,7 +554,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                         for (OneClickExportVO reportArticleVO : reportArticleVOS) {
                             ExportReportDetailVO detailVO = new ExportReportDetailVO();
                             detailVO.setTitle(i + "、" + reportArticleVO.getTitle());
-                            detailVO.setDigest(reportArticleVO.getDigest());
+                            detailVO.setDigest(reportArticleVO.getOldContent());
                             String htmlLink = "<a href='" + reportArticleVO.getArticleUrl() + "'>" + reportArticleVO.getArticleUrl() + "</a>";
                             detailVO.setArticle_url(htmlLink);
                             detailVOS.add(detailVO);

+ 1 - 0
src/main/java/com/cslg/ppa/vo/OneClickExportVO.java

@@ -33,4 +33,5 @@ public class OneClickExportVO {
 
     private Integer ifExportFromLocal;
 
+    private String oldContent;
 }

+ 2 - 0
src/main/java/com/cslg/ppa/vo/SelectAssoReportArticleVO.java

@@ -34,4 +34,6 @@ public class SelectAssoReportArticleVO {
     private Integer sourceType;
 
     private String sourceName;
+
+    private String oldContent;
 }

File diff suppressed because it is too large
+ 2 - 2
src/main/resources/application-dev.yml


+ 5 - 1
src/main/resources/mapper/ArticleInfoMapper.xml

@@ -5,7 +5,10 @@
     <select id="selectArticleInfoList" resultType="com.cslg.ppa.vo.SelectArticleInfoVO">
         select ai.id as articleId,
                ai.title,
-               ai.digest,
+               CASE
+                  WHEN ai.old_content IS NOT NULL AND ai.old_content != '' THEN ai.old_content
+                  ELSE ai.digest
+               END AS digest,
                ai.category_id,
                ai.source_id,
                ai.public_time,
@@ -71,6 +74,7 @@
         select ai.id as articleId,
         ai.title,
         ai.digest,
+        ai.old_content,
         ai.category_id,
         ai.public_time,
         ai.article_url,

+ 4 - 1
src/main/resources/mapper/ReportMapper.xml

@@ -7,7 +7,10 @@
                ara.report_id,
                ara.article_id,
                ai.title,
-               ai.digest,
+               CASE
+                   WHEN ai.old_content IS NOT NULL AND ai.old_content != '' THEN ai.old_content
+                   ELSE ai.digest
+                END AS digest,
                ai.category_id,
                ca.name as categoryName,
                ai.public_time,