Explorar o código

新上监控提交

zhouzeyu@c-top.com.cn %!s(int64=3) %!d(string=hai) anos
pai
achega
23967ffe52

+ 8 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsNewGroupReportCtrl.java

@@ -68,15 +68,17 @@ public class KsNewGroupReportCtrl {
 
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
+        startDate=startDate+" 00:00:00";
+        endDate=endDate+" 59:59:59";
         String target = requestBody.getString("target");
         String order = requestBody.getString("order");
         try {
-            JSONObject sumData = newGroupReportService.getSumNewGroupBy(accountIds, startDate, endDate);
+            /*JSONObject sumData = newGroupReportService.getSumNewGroupBy(accountIds, startDate, endDate);
             List<JSONObject> chartData = newGroupReportService.getKsNewGroupGroupByStatDate(accountIds, startDate, endDate);
-            List<JSONObject> listData = newGroupReportService.getKsNewGroupGroupByAccount(accountIds, startDate, endDate, target, order);
-           /* List<JSONObject> chartData = newMonitorService.getKuaiShouGroupMessageGroup(accountIds, startDate, endDate);
+            List<JSONObject> listData = newGroupReportService.getKsNewGroupGroupByAccount(accountIds, startDate, endDate, target, order);*/
+            List<JSONObject> chartData = newMonitorService.getKuaiShouGroupMessageGroup(accountIds, startDate, endDate);
             JSONObject sumData = newMonitorService.getKuaiShouGroupSum(accountIds, startDate, endDate);
-            List<JSONObject> listData = newMonitorService.getKuaiShouGroupMessage(accountIds, startDate, endDate, target);*/
+            List<JSONObject> listData = newMonitorService.getKuaiShouGroupMessage(accountIds, startDate, endDate, target);
             result.put("sumData", sumData);
             result.put("chartData", chartData);
             result.put("listData", listData);
@@ -133,6 +135,8 @@ public class KsNewGroupReportCtrl {
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
         String target = requestBody.getString("target");
+        startDate=startDate+" 00:00:00";
+        endDate=endDate+" 59:59:59";
         String order = requestBody.getString("order");
         List<JSONObject> listData = newMonitorService.getKuaiShouGroupMessage(accountIds, startDate, endDate, target);
 

+ 8 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsNewPlanReportCtrl.java

@@ -60,15 +60,17 @@ public class KsNewPlanReportCtrl {
         }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
+        startDate=startDate+" 00:00:00";
+        endDate=endDate+" 59:59:59";
         String target = requestBody.getString("target");
         String order = requestBody.getString("order");
         try {
-            JSONObject sumData = newPlanReportService.getSumNewPlanBy(accountIds, startDate, endDate);
+            /*JSONObject sumData = newPlanReportService.getSumNewPlanBy(accountIds, startDate, endDate);
             List<JSONObject> chartData = newPlanReportService.getKsNewPlanGroupByStatDate(accountIds, startDate, endDate);
-            List<JSONObject> listData = newPlanReportService.getKsNewPlanGroupByAccount(accountIds, startDate, endDate, target, order);
-        /*    List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "1");
+            List<JSONObject> listData = newPlanReportService.getKsNewPlanGroupByAccount(accountIds, startDate, endDate, target, order);*/
+           List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "1");
             List<JSONObject> chartData = newMonitorService.getPlanMessageGroup(accountIds, startDate, endDate, "1");
-            JSONObject sumData = newMonitorService.getPlanSum(accountIds, startDate, endDate, "1");*/
+            JSONObject sumData = newMonitorService.getPlanSum(accountIds, startDate, endDate, "1");
             result.put("sumData", sumData);
             result.put("chartData", chartData);
             result.put("listData", listData);
@@ -127,6 +129,8 @@ public class KsNewPlanReportCtrl {
         }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
+        startDate=startDate+" 00:00:00";
+        endDate=endDate+" 59:59:59";
         String target = requestBody.getString("target");
         String order = requestBody.getString("order");
         List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "1");

+ 4 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceNewPlanReportCtrl.java

@@ -60,6 +60,8 @@ public class BytedanceNewPlanReportCtrl {
         }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
+        startDate=startDate+" 00:00:00";
+        endDate=endDate+" 59:59:59";
         String target = requestBody.getString("target");
         String order = requestBody.getString("order");
         try {
@@ -102,6 +104,8 @@ public class BytedanceNewPlanReportCtrl {
         }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
+        startDate=startDate+" 00:00:00";
+        endDate=endDate+" 59:59:59";
         String target = requestBody.getString("target");
         String order = requestBody.getString("order");
         List<JSONObject> listData = newMonitorService.getPlanMessage(accountIds, startDate, endDate, target, "0");