Преглед изворни кода

快手、头条账户视频报表更换application库数据

zhaoxian пре 3 година
родитељ
комит
7329d7bb0d

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KuaiShouAccountReportCtrl.java

@@ -93,7 +93,7 @@ public class KuaiShouAccountReportCtrl {
         String target = requestBody.getString("target");
         String order = requestBody.getString("order");
         try {
-            List<JSONObject> listData = kuaiShouAccountReportService.getListDataBy(mediaId, discount, accounts, startDate, endDate, hour, target, order);
+            List<JSONObject> listData = kuaiShouAccountReportService.getListDataBy(mediaId, accounts, startDate, endDate, hour, target, order);
             result.setResult(listData);
             result.setSuccess(true);
         } catch (Exception e) {
@@ -136,7 +136,7 @@ public class KuaiShouAccountReportCtrl {
         }
         String order = requestBody.getString("order");
         int hour = requestBody.getInteger("hour");
-        List<JSONObject> excelData = kuaiShouAccountReportService.getExcelDataBy(filed, mediaId, accounts, startDate, endDate, hour, target, order);
+        List<JSONObject> excelData = kuaiShouAccountReportService.getListDataBy(filed, accounts, startDate, endDate, hour, target, order);
         if (excelData.isEmpty()) {
             return;
         }

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaiShouAccountReportService.java

@@ -14,7 +14,7 @@ public interface IKuaiShouAccountReportService {
 
     List<JSONObject> getChartDataBy(String mediaId, BigDecimal discount, JSONArray accounts, String startDate, String endDate) throws ParseException;
 
-    List<JSONObject> getListDataBy(String mediaId, BigDecimal discount, JSONArray accounts, String startDate, String endDate, int hour, String target, String order);
+    List<JSONObject> getListDataBy(String mediaId, JSONArray accounts, String startDate, String endDate, int hour, String target, String order);
 
     List<JSONObject> getExcelDataBy(String filed, String mediaId, JSONArray accounts, String startDate, String endDate, int hour, String target, String order);
 

+ 2 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouAccountReportServiceImpl.java

@@ -91,7 +91,7 @@ public class KuaiShouAccountReportServiceImpl implements IKuaiShouAccountReportS
     }
 
     @Override
-    public List<JSONObject> getListDataBy(String mediaId, BigDecimal discount, JSONArray accounts, String startDate, String endDate, int hour, String target, String order) {
+    public List<JSONObject> getListDataBy(String mediaId, JSONArray accounts, String startDate, String endDate, int hour, String target, String order) {
         List<JSONObject> result;
         if (!Check.isNull(target) && "photo_show".equals(target)) {
             target = "`show`";
@@ -127,9 +127,7 @@ public class KuaiShouAccountReportServiceImpl implements IKuaiShouAccountReportS
 
     @Override
     public List<JSONObject> getExcelDataBy(String filed, String mediaId, JSONArray accounts, String startDate, String endDate, int hour, String target, String order) {
-        filed = filed.replace("photo_show", "`show`")
-                .replace("keyAction", "key_action")
-                .replace("keyActionCost", "key_action_cost");
+        filed = filed.replace("photo_show", "`show`");
         List<JSONObject> result;
         if (startDate.equals(endDate)) {
             if (startDate.equals(DateUtils.date2Str())) {