|
@@ -13,7 +13,6 @@ import com.alibaba.fastjson.JSON;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
-import com.xxl.job.core.util.DateUtil;
|
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -38,7 +37,6 @@ import java.io.IOException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.net.URLDecoder;
|
|
import java.net.URLDecoder;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
-import java.util.Date;
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
@@ -60,6 +58,10 @@ public class KuaishouHostingTemplateController {
|
|
private IKuaiShouVideoGetService videoGetService;
|
|
private IKuaiShouVideoGetService videoGetService;
|
|
@Autowired
|
|
@Autowired
|
|
private ISysRoleService sysRoleService;
|
|
private ISysRoleService sysRoleService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IUserAllocationService userAllocationService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IProjectService projectService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -80,10 +82,10 @@ public class KuaishouHostingTemplateController {
|
|
queryWrapper.eq("account_id", accountId);
|
|
queryWrapper.eq("account_id", accountId);
|
|
queryWrapper.eq("status", 0);
|
|
queryWrapper.eq("status", 0);
|
|
if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
|
|
if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
|
|
- Date start = DateUtil.parseDate(startDate += " 00:00:01");
|
|
|
|
- Date end = DateUtil.parseDate(endDate += " 23:59:59");
|
|
|
|
- queryWrapper.ge("stat_date",start);
|
|
|
|
- queryWrapper.le("stat_date",end);
|
|
|
|
|
|
+ startDate += " 00:00:01";
|
|
|
|
+ endDate += " 23:59:59";
|
|
|
|
+ queryWrapper.ge("stat_date", startDate);
|
|
|
|
+ queryWrapper.le("stat_date", endDate);
|
|
}
|
|
}
|
|
if (!Check.isNull(name)) {
|
|
if (!Check.isNull(name)) {
|
|
queryWrapper.like("photo_name", name);
|
|
queryWrapper.like("photo_name", name);
|
|
@@ -102,12 +104,6 @@ public class KuaishouHostingTemplateController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private IUserAllocationService userAllocationService;
|
|
|
|
-
|
|
|
|
- @Autowired
|
|
|
|
- private IProjectService projectService;
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 分页列表查询
|
|
* 分页列表查询
|
|
*
|
|
*
|