|
@@ -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);
|