浏览代码

今日明细返回加入昨天明细

yumeng 6 年之前
父节点
当前提交
f7ef818b34

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -47,7 +47,7 @@ import java.lang.reflect.Type;
 import java.util.*;
 
 /**
- * @author 于萌萌
+ * @author
  */
 @Slf4j
 @Service

+ 6 - 2
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/BytedanceReportServiceImpl.java

@@ -556,10 +556,14 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
             String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
             String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
             if (type == 1) {//今日分时列表
-                reportList = reportMapper.selectReportDetail(nowDate);
+                List<JSONObject> nowReportList = reportMapper.selectReportDetail(nowDate);
+                List<JSONObject> yesterdayReportList = reportMapper.selectReportDetail(anotherDay);
+                JSONObject json = new JSONObject();
+                json.put("now", nowReportList);
+                json.put("yesterday", yesterdayReportList);
+                reportList.add(json);
 
             } else if (type == 2) { //昨日分时列表
-
                 reportList = reportMapper.selectReportDetail(anotherDay);
 
             } else if (type == 3) {// 近七天分天列表