Просмотр исходного кода

Merge #32 into master from pingkang

getAdqCreatives

* pingkang: (1 commits)
  getAdqCreatives

Signed-off-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>
Merged-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>

CR-link: https://codeup.aliyun.com/60c06368dbbed34fe0f0c263/job/hr_job-bytedance/change/32
huangpingkang 1 год назад
Родитель
Сommit
f5244cd4a9

+ 7 - 4
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/BytedanceCdpProjectServiceImpl.java

@@ -461,24 +461,27 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
         param.put("account_id", accountId);
         param.put("account_id", accountId);
         param.put("page", page);
         param.put("page", page);
         param.put("page_size", 100);
         param.put("page_size", 100);
-        if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
-            JSONArray filtering = new JSONArray();
+        JSONArray filtering = new JSONArray();
+        if (!Check.isNull(startDate)) {
             JSONObject greObj = new JSONObject();
             JSONObject greObj = new JSONObject();
             greObj.put("field", "last_modified_time");
             greObj.put("field", "last_modified_time");
             greObj.put("operator", "GREATER_EQUALS");
             greObj.put("operator", "GREATER_EQUALS");
             JSONArray startDateVls = new JSONArray();
             JSONArray startDateVls = new JSONArray();
             startDateVls.add(String.valueOf(DateUtils.dt2milli(startDate + " 00:00:00")));
             startDateVls.add(String.valueOf(DateUtils.dt2milli(startDate + " 00:00:00")));
-//            startDateVls.add(String.valueOf(DateUtils.dt2milli( "2025-02-15 00:00:00")));
             greObj.put("values", startDateVls);
             greObj.put("values", startDateVls);
             filtering.add(greObj);
             filtering.add(greObj);
+        }
+
+        if (!Check.isNull(endDate)) {
             JSONObject lesObj = new JSONObject();
             JSONObject lesObj = new JSONObject();
             lesObj.put("field", "last_modified_time");
             lesObj.put("field", "last_modified_time");
             lesObj.put("operator", "LESS_EQUALS");
             lesObj.put("operator", "LESS_EQUALS");
             JSONArray endDateVls = new JSONArray();
             JSONArray endDateVls = new JSONArray();
             endDateVls.add(String.valueOf(DateUtils.dt2milli(endDate + " 23:59:59")));
             endDateVls.add(String.valueOf(DateUtils.dt2milli(endDate + " 23:59:59")));
-//            endDateVls.add(String.valueOf(DateUtils.dt2milli("2025-07-09 23:59:59")));
             lesObj.put("values", endDateVls);
             lesObj.put("values", endDateVls);
             filtering.add(lesObj);
             filtering.add(lesObj);
+        }
+        if (!Check.isNull(filtering)) {
             param.put("filtering", filtering);
             param.put("filtering", filtering);
         }
         }
         param.put("is_deleted", isDeleted);
         param.put("is_deleted", isDeleted);