Procházet zdrojové kódy

fix bug of add queryProjectMember on 2020.6.17

jiequan.bi před 5 roky
rodič
revize
65d278bd70

+ 8 - 6
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceHomepageReportServiceImpl.java

@@ -101,12 +101,12 @@ public class BytedanceHomepageReportServiceImpl implements IBytedanceHomepageRep
             //今天
             case 1:
                 resultChart = getCompareGroupByHour(nowDate, anotherDay);
-                resultList = getFormDetailByDate(nowDate,nowDate,"hour");
+                resultList = getFormDetailByDate(nowDate,anotherDay,"hour");
                 break;
             //昨天
             case 2:
                 resultChart = getCompareGroupByHour(anotherDay, DateUtils.getAnotherDay(SystemDateConstant.yyyy_MM_dd, anotherDay, -1));
-                resultList = getFormDetailByDate(anotherDay,anotherDay,"hour");
+                resultList = getFormDetailByDate(anotherDay,DateUtils.getAnotherDay(SystemDateConstant.yyyy_MM_dd, anotherDay, -1),"hour");
                 break;
             //近一周
             case 3:
@@ -173,13 +173,15 @@ public class BytedanceHomepageReportServiceImpl implements IBytedanceHomepageRep
 
     //表格数据查询
     private List<JSONObject> getFormDetailByDate(String endDate, String startDate, String group){
-        List<JSONObject> result =null;
+        List<JSONObject> result ;
         if("day".equals(group)){
-            result= bytedanceHomepageMapper.queryDetailByStartEndDate(endDate,startDate);
+            result= getListLink(bytedanceHomepageMapper.queryDetailByStartEndDate(endDate,startDate));
         }else {
-            result= bytedanceHomepageMapper.queryTodayDetailReportBy(endDate);
+            List<JSONObject> after=bytedanceHomepageMapper.queryTodayDetailReportBy(endDate);
+            List<JSONObject> before=bytedanceHomepageMapper.queryTodayDetailReportBy(startDate);
+            result=LinkUtils.getCompareDate(after,before,"statHour");
         }
-        return getListLink(result);
+        return result;
     }
 
     //自定义日期对比(日对比,月对比)