소스 검색

首页 修改sQL

zhaoxian 3 년 전
부모
커밋
ea154cceb2

+ 2 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/BytedanceAccountReportDailyDwMapper.xml

@@ -144,7 +144,7 @@
         </if>
         ) t7 ON t1.project_id = t7.project_id
         LEFT JOIN (
-        SELECT project_id , SUM(new_ad_num) as 'unitNum' FROM app_bytedance_account_base_info_d
+        SELECT project_id , SUM(new_ad_num) as 'unitNum' FROM application.app_bytedance_account_base_info_d
         WHERE stat_date =DATE_FORMAT(DATE_SUB(#{startTime}, INTERVAL 1 DAY ), '%Y%m%d')
         AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         GROUP BY project_id
@@ -215,7 +215,7 @@
         </if>
         ) t6 ON t1.project_id = t6.project_id
         LEFT JOIN (
-        SELECT project_id , SUM(new_ad_num) as 'unitNum' FROM app_bytedance_account_base_info_d
+        SELECT project_id , SUM(new_ad_num) as 'unitNum' FROM application.app_bytedance_account_base_info_d
         WHERE stat_date >= #{startTime}
         stat_date &lt;= #{endTime}
         AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')

+ 4 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/KuaishouAccountReportDailyDwMapper.xml

@@ -147,13 +147,13 @@
         </if>
         ) t7 ON t1.project_id = t7.project_id
         LEFT JOIN (
-        SELECT project_id , SUM(new_unit_num) as 'unitNum' FROM app_kuaishou_account_base_info_d
+        SELECT project_id , SUM(new_unit_num) as 'unitNum' FROM application.app_kuaishou_account_base_info_d
         WHERE stat_date =DATE_FORMAT(DATE_SUB(#{startTime}, INTERVAL 1 DAY ), '%Y%m%d')
         AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         GROUP BY project_id
         ) t8 ON t1.project_id = t8.project_id
         LEFT JOIN (
-        SELECT project_id ,ad_scene, SUM(charge) as 'sceneCharge' FROM app_kuaishou_account_ad_scene_report_d
+        SELECT project_id ,ad_scene, SUM(charge) as 'sceneCharge' FROM application.app_kuaishou_account_ad_scene_report_d
         WHERE stat_date =DATE_FORMAT(DATE_SUB(#{startTime}, INTERVAL 1 DAY ), '%Y%m%d')
         AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         GROUP BY project_id,ad_scene
@@ -226,14 +226,14 @@
         </if>
         ) t6 ON t1.project_id = t6.project_id
         LEFT JOIN (
-        SELECT project_id , SUM(new_unit_num) as 'unitNum' FROM app_kuaishou_account_base_info_d
+        SELECT project_id , SUM(new_unit_num) as 'unitNum' FROM application.app_kuaishou_account_base_info_d
         WHERE stat_date >= #{startTime}
         AND stat_date &lt;= #{endTime}
         AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         GROUP BY project_id
         ) t8 ON t1.project_id = t8.project_id
         LEFT JOIN (
-        SELECT project_id ,ad_scene, SUM(charge) as 'sceneCharge' FROM app_kuaishou_account_ad_scene_report_d
+        SELECT project_id ,ad_scene, SUM(charge) as 'sceneCharge' FROM application.app_kuaishou_account_ad_scene_report_d
         WHERE stat_date >= #{startTime}
         AND stat_date &lt;= #{endTime}
         AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')

+ 4 - 3
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/BytedanceAccountReportDailyDwServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.ctop.material.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.ctop.material.mapper.BytedanceAccountReportDailyDwMapper;
@@ -89,10 +90,10 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
 //            PageHelper.startPage(pageNo, pageSize, false);
             data = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, nowHour);
         }
-//        PageInfo<JSONObject> page = new PageInfo<>();
-//        page.setList(data);
+        PageInfo<JSONObject> page = new PageInfo<>();
+        page.setList(data);
 //        page.setTotal(total);
-        return Result.OK(data);
+        return Result.OK(page);
     }
 
 }

+ 3 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/KuaishouAccountReportDailyDwServiceImpl.java

@@ -1,7 +1,6 @@
 package org.jeecg.ctop.material.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
@@ -90,9 +89,9 @@ public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccount
 //            PageHelper.startPage(pageNo, pageSize, false);
             data = kuaishouAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, nowHour);
         }
-//        PageInfo<JSONObject> page = new PageInfo<>();
-//        page.setList(data);
+        PageInfo<JSONObject> page = new PageInfo<>();
+        page.setList(data);
 //        page.setTotal(total);
-        return Result.OK(data);
+        return Result.OK(page);
     }
 }