|
@@ -40,6 +40,7 @@ public class ByteDanceAdvertisePlanController {
|
|
*/
|
|
*/
|
|
@GetMapping(value = "/list")
|
|
@GetMapping(value = "/list")
|
|
public Result<IPage<ByteDanceAdvertisePlan>> queryPageList(ByteDanceAdvertisePlan byteDanceAdvertisePlan,
|
|
public Result<IPage<ByteDanceAdvertisePlan>> queryPageList(ByteDanceAdvertisePlan byteDanceAdvertisePlan,
|
|
|
|
+ @RequestParam(name="status",defaultValue = "")String status,
|
|
@RequestParam(name="startDate",defaultValue = "")String startDate,
|
|
@RequestParam(name="startDate",defaultValue = "")String startDate,
|
|
@RequestParam(name="endDate",defaultValue = "")String endDate,
|
|
@RequestParam(name="endDate",defaultValue = "")String endDate,
|
|
@RequestParam(name = "accountId", defaultValue = "") String accountId,
|
|
@RequestParam(name = "accountId", defaultValue = "") String accountId,
|
|
@@ -50,11 +51,10 @@ public class ByteDanceAdvertisePlanController {
|
|
if (!accountId.isEmpty()) {
|
|
if (!accountId.isEmpty()) {
|
|
byteDanceAdvertisePlan.setAccountId(accountId);
|
|
byteDanceAdvertisePlan.setAccountId(accountId);
|
|
}
|
|
}
|
|
- if(byteDanceAdvertisePlan.getToutiaoStatus()!=null){
|
|
|
|
- String toutiaoStatus="AD_STATUS"+byteDanceAdvertisePlan.getToutiaoStatus();
|
|
|
|
- byteDanceAdvertisePlan.setToutiaoStatus(toutiaoStatus);
|
|
|
|
- }
|
|
|
|
QueryWrapper<ByteDanceAdvertisePlan> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertisePlan, req.getParameterMap());
|
|
QueryWrapper<ByteDanceAdvertisePlan> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertisePlan, req.getParameterMap());
|
|
|
|
+ if(status!=null&&!status.trim().equals("")){
|
|
|
|
+ queryWrapper.eq("opt_status",status);
|
|
|
|
+ }
|
|
if(null!=startDate&&!"".equals(startDate)){
|
|
if(null!=startDate&&!"".equals(startDate)){
|
|
queryWrapper.ge("ad_create_time",startDate+" 00:00:00");
|
|
queryWrapper.ge("ad_create_time",startDate+" 00:00:00");
|
|
}
|
|
}
|
|
@@ -66,7 +66,7 @@ public class ByteDanceAdvertisePlanController {
|
|
//处理计划投放状态
|
|
//处理计划投放状态
|
|
if (!pageList.getRecords().isEmpty()) {
|
|
if (!pageList.getRecords().isEmpty()) {
|
|
pageList.getRecords().forEach(it -> {
|
|
pageList.getRecords().forEach(it -> {
|
|
- if (it.getToutiaoStatus().equals("AD_STATUS_DELIVERY_OK")) {
|
|
|
|
|
|
+ if (it.getOptStatus().equals("AD_STATUS_ENABLE")) {
|
|
it.setPlanStatus(true);
|
|
it.setPlanStatus(true);
|
|
} else {
|
|
} else {
|
|
it.setPlanStatus(false);
|
|
it.setPlanStatus(false);
|