Browse Source

补全数据处理,排序

zhaoxian 4 years ago
parent
commit
3c64502435

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

@@ -132,6 +132,7 @@ public class EtlKuaishouAudienceAccountDailyServiceImpl extends ServiceImpl<EtlK
         }
         }
         List<JSONObject> list = null;
         List<JSONObject> list = null;
         List<String> typeList = accountDailyMapper.getSceneTypeList();
         List<String> typeList = accountDailyMapper.getSceneTypeList();
+        typeList.remove("全部");
         if ("pie".equals(dataType)) {
         if ("pie".equals(dataType)) {
             list = accountDailyMapper.getSceneInfo(value, accountId, parType);
             list = accountDailyMapper.getSceneInfo(value, accountId, parType);
             if (Check.isNull(list)) {
             if (Check.isNull(list)) {
@@ -163,9 +164,6 @@ public class EtlKuaishouAudienceAccountDailyServiceImpl extends ServiceImpl<EtlK
                 newDayList.add(data.getString("type"));
                 newDayList.add(data.getString("type"));
             }
             }
         }
         }
-        if (!newDayList.contains("全部")) {
-            typeList.remove("全部");
-        }
         for (String type : typeList) {
         for (String type : typeList) {
             if (!newDayList.contains(type)) {
             if (!newDayList.contains(type)) {
                 JSONObject obj = new JSONObject();
                 JSONObject obj = new JSONObject();