Parcourir la source

Merge branch 'wyp/0219-produceExport' of Server/long-article-recommend into master

wangyunpeng il y a 4 mois
Parent
commit
d26217cdb6

+ 1 - 0
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/ProducePlanAuditExport.java

@@ -13,4 +13,5 @@ public class ProducePlanAuditExport {
     private Integer auditCount;
     private Integer auditPassCount;
     private Integer auditFailCount;
+    private Double auditPassRate = 0.0;
 }

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

@@ -1785,8 +1785,13 @@ public class DataDashboardService {
             }
         }
 
+        List<Pair<String, String>> styles = Arrays
+                .asList(
+                        Pair.of("I", "0%")
+                );
+
         doSendFeishuSheet(dateStrList, dailyDetailSheetToken, "28RgAZ", rowNum, rows,
-                2, null, null);
+                2, styles, null);
     }
 
     private Map<String, ProducePlanAuditExport> getOldProducePlanAuditExport(String dateStr, String sheetToken, String sheetId) {
@@ -1875,6 +1880,9 @@ public class DataDashboardService {
             export.setAuditPassCount(yesterdayAuditPassNum);
             export.setHisNotAuditCount(waitingAuditNum);
             export.setAuditFailCount(yesterdayAuditFailNum);
+            if (yesterdayAuditNum > 0) {
+                export.setAuditPassRate(yesterdayAuditPassNum * 1.0 / yesterdayAuditNum);
+            }
             exportList.add(export);
         }
         ProducePlanAuditExport yesterdayExport = yesterdayMap.get("SUM");
@@ -1889,6 +1897,9 @@ public class DataDashboardService {
         sum.setAuditPassCount(totalAuditPassNum);
         sum.setHisNotAuditCount(totalWaitingAuditNum);
         sum.setAuditFailCount(totalAuditFailNum);
+        if (totalAuditNum > 0) {
+            sum.setAuditPassRate(totalAuditPassNum * 1.0 / totalAuditNum);
+        }
         exportList.add(0, sum);
         return exportList;
     }