Merge branch 'wyp/1226-export' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/DataDashboardService.java

@@ -1734,7 +1734,7 @@ public class DataDashboardService {
     @XxlJob("producePlanAuditExport")
     public ReturnT<String> producePlanAuditExportJob(String param) {
         List<String> dateStrList = DateUtils.getBeforeDays(null, null, 1);
-        producePlanAuditExport(dateStrList.get(0));
+        producePlanAuditExport(dateStrList);
         return ReturnT.SUCCESS;
     }
 
@@ -1742,7 +1742,15 @@ public class DataDashboardService {
         if (!StringUtils.hasText(dateStr)) {
             dateStr = DateUtils.getBeforeDaysDateStr("yyyyMMdd", 1);
         }
-        List<ProducePlanAuditExport> exportList = buildProducePlanAuditExport(dateStr);
+        producePlanAuditExport(Collections.singletonList(dateStr));
+    }
+
+    public void producePlanAuditExport(List<String> dateStrList) {
+        List<ProducePlanAuditExport> exportList = new ArrayList<>();
+        dateStrList = Lists.reverse(dateStrList);
+        for (String dateStr : dateStrList) {
+            exportList.addAll(buildProducePlanAuditExport(dateStr));
+        }
         if (CollectionUtil.isEmpty(exportList)) {
             return;
         }
@@ -1765,7 +1773,7 @@ public class DataDashboardService {
             }
         }
 
-        doSendFeishuSheet(Collections.singletonList(dateStr), sheetToken, "28RgAZ", rowNum, rows,
+        doSendFeishuSheet(dateStrList, sheetToken, "28RgAZ", rowNum, rows,
                 2, null, null);
     }
 

long-article-recommend-service/src/main/resources/mapper/aigc/AigcBaseMapper.xml

@@ -305,7 +305,7 @@
             #{item}
         </foreach>
         and ((pper.audit_status in (1, 2) and pper.audit_timestamp between #{timeStart} and #{timeEnd})
-                 or (prr.review_status = 0 and pper.create_timestamp &lt; #{timeStart}))
+                 or (prr.review_status = 0 and pper.create_timestamp &lt; #{timeStart} and pper.status = 6))
         GROUP BY pper.plan_id, pper.audit_status
     </select>
 
@@ -317,7 +317,7 @@
         <foreach collection="planIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        and pper.status = 2
+        and pper.status >= 2
         and pper.produce_timestamp between #{timeStart} and #{timeEnd}
         GROUP BY pper.plan_id
     </select>

long-article-recommend-service/src/test/java/com/tzld/longarticle/recommend/server/DataDashboardTest.java

@@ -34,10 +34,8 @@ public class DataDashboardTest {
 
     @Test
     public void producePlanAuditExport() {
-        List<String> dateStrList = DateUtils.getBeforeDays(null, null, 90);
-        for (String dateStr : dateStrList) {
-            dataDashboardService.producePlanAuditExport(dateStr);
-        }
+        List<String> dateStrList = DateUtils.getBeforeDays(null, null, 86);
+        dataDashboardService.producePlanAuditExport(dateStrList);
     }
 
 }