Bläddra i källkod

盯盘2.0功能开发运营当日数据修改

zhaoxian 4 år sedan
förälder
incheckning
105cad6d54

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/EtlKuaishouReportAccountHourlyMapper.xml

@@ -546,6 +546,7 @@
         IFNULL(CONCAT(CAST(ROUND((SUM(charge)-t5.y_charge)/t5.y_charge*100,3)as CHAR),'%'),'0%') as 'grewRatio',
         IFNULL(CONCAT(CAST(ROUND((SUM(charge)-t6.week_charge)/t6.week_charge*100,3)as CHAR),'%'),'0%') as
         'weekGrewRatio',
+        t2.project_id 'projectId',
         t3.project_name as 'projectName',
         IFNULL(ROUND(SUM(play_3s_count) / SUM(aclick) * 100, 2), 0) as 'play3sRatio',
         (SELECT count(1) FROM ctop_user_allocation where project_id = t3.id) as 'accountCount',

+ 7 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaishouReportAccountHourlyServiceImpl.java

@@ -444,17 +444,23 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
         }
         request.put("userIds", getUserIdList(userId));
         List<JSONObject> data = null;
+        JSONObject result = new JSONObject();
         //单日数据
+        String updateTime = "";
         if (startTime.equals(endTime)) {
             data = etlHourlyAccountMapper.queryEveryHourlyCharge(request);
+            updateTime = etlHourlyAccountMapper.getNewlyUpdateTime();
         } else {
+            updateTime = etlDailyAccountMapper.getNewlyUpdateTime();
             if (parameterCode.equals("campaign") || parameterCode.equals("unit")) {
                 data = etlDailyAccountMapper.queryEveryDayCount(request);
             } else {
                 data = etlDailyAccountMapper.queryEveryDayCharge(request);
             }
         }
-        return Result.ok(data);
+        result.put("data", data);
+        result.put("updateTime", updateTime);
+        return Result.ok(result);
     }
 
     /**