|
@@ -57,13 +57,13 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
if(null!=mList&&!mList.isEmpty()){
|
|
if(null!=mList&&!mList.isEmpty()){
|
|
List<ByteDanceVideoReportDaily> reports = new ArrayList<>();
|
|
List<ByteDanceVideoReportDaily> reports = new ArrayList<>();
|
|
for(ByteDanceVideoReportDaily report :mList){
|
|
for(ByteDanceVideoReportDaily report :mList){
|
|
- if(null == report.getMaterialName()||report.getMaterialName().trim().equals("")){
|
|
|
|
|
|
+ if(null == report.getMaterialName()|| "".equals(report.getMaterialName().trim())){
|
|
report.setMaterialName("-");
|
|
report.setMaterialName("-");
|
|
}
|
|
}
|
|
- if(null == report.getProjectName()||report.getProjectName().trim().equals("")){
|
|
|
|
|
|
+ if(null == report.getProjectName()|| "".equals(report.getProjectName().trim())){
|
|
report.setProjectName("-");
|
|
report.setProjectName("-");
|
|
}
|
|
}
|
|
- if(null == report.getAdvertiserName()||report.getAdvertiserName().trim().equals("")){
|
|
|
|
|
|
+ if(null == report.getAdvertiserName()|| "".equals(report.getAdvertiserName().trim())){
|
|
report.setAdvertiserName("-");
|
|
report.setAdvertiserName("-");
|
|
}
|
|
}
|
|
reports.add(report);
|
|
reports.add(report);
|
|
@@ -113,7 +113,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
|
|
|
|
|
|
+ }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
@@ -125,19 +125,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
}
|
|
}
|
|
- }else if(roleCode.equals("shot")){
|
|
|
|
|
|
+ }else if("shot".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plan")){
|
|
|
|
|
|
+ }else if("plan".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plane") || roleCode.equals("planeLeader")){
|
|
|
|
|
|
+ }else if("plane".equals(roleCode) || "planeLeader".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("clip")){
|
|
|
|
|
|
+ }else if("clip".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("designTeamLeader")){
|
|
|
|
|
|
+ }else if("designTeamLeader".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
}else{
|
|
}else{
|
|
@@ -200,7 +200,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
|
|
|
|
|
|
+ }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
@@ -212,19 +212,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
}
|
|
}
|
|
- }else if(roleCode.equals("shot")){
|
|
|
|
|
|
+ }else if("shot".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plan")){
|
|
|
|
|
|
+ }else if("plan".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plane") || roleCode.equals("planeLeader")){
|
|
|
|
|
|
+ }else if("plane".equals(roleCode) || "planeLeader".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("clip")){
|
|
|
|
|
|
+ }else if("clip".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("designTeamLeader")){
|
|
|
|
|
|
+ }else if("designTeamLeader".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
}else {
|
|
}else {
|
|
@@ -286,7 +286,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
|
|
|
|
|
|
+ }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
@@ -298,19 +298,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
}
|
|
}
|
|
- }else if(roleCode.equals("shot")){
|
|
|
|
|
|
+ }else if("shot".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plan")){
|
|
|
|
|
|
+ }else if("plan".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plane") || roleCode.equals("planeLeader")){
|
|
|
|
|
|
+ }else if("plane".equals(roleCode) || "planeLeader".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("clip")){
|
|
|
|
|
|
+ }else if("clip".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("designTeamLeader")){
|
|
|
|
|
|
+ }else if("designTeamLeader".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
}else {
|
|
}else {
|
|
@@ -375,7 +375,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
PageHelper.orderBy(sort);
|
|
PageHelper.orderBy(sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
|
|
|
|
|
|
+ }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
PageHelper.orderBy(sort);
|
|
PageHelper.orderBy(sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
@@ -387,19 +387,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
PageHelper.orderBy(sort);
|
|
PageHelper.orderBy(sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
}
|
|
}
|
|
- }else if(roleCode.equals("shot")){
|
|
|
|
|
|
+ }else if("shot".equals(roleCode)){
|
|
PageHelper.orderBy(sort);
|
|
PageHelper.orderBy(sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plan")){
|
|
|
|
|
|
+ }else if("plan".equals(roleCode)){
|
|
PageHelper.orderBy(sort);
|
|
PageHelper.orderBy(sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plane") || roleCode.equals("planeLeader")){
|
|
|
|
|
|
+ }else if("plane".equals(roleCode) || "planeLeader".equals(roleCode)){
|
|
PageHelper.orderBy(sort);
|
|
PageHelper.orderBy(sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("clip")){
|
|
|
|
|
|
+ }else if("clip".equals(roleCode)){
|
|
PageHelper.orderBy(sort);
|
|
PageHelper.orderBy(sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("designTeamLeader")){
|
|
|
|
|
|
+ }else if("designTeamLeader".equals(roleCode)){
|
|
PageHelper.orderBy(sort);
|
|
PageHelper.orderBy(sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
}else {
|
|
}else {
|
|
@@ -443,7 +443,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
|
|
|
|
|
|
+ }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
|
|
@@ -455,19 +455,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
|
|
}
|
|
}
|
|
- }else if(roleCode.equals("shot")){
|
|
|
|
|
|
+ }else if("shot".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plan")){
|
|
|
|
|
|
+ }else if("plan".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("plane") || roleCode.equals("planeLeader")){
|
|
|
|
|
|
+ }else if("plane".equals(roleCode) || "planeLeader".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("clip")){
|
|
|
|
|
|
+ }else if("clip".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
|
|
- }else if(roleCode.equals("designTeamLeader")){
|
|
|
|
|
|
+ }else if("designTeamLeader".equals(roleCode)){
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
PageHelper.startPage(pageNo,pageSize,sort);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
|
|
}else{
|
|
}else{
|
|
@@ -522,16 +522,16 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
//admin能看所有视频
|
|
//admin能看所有视频
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetail(companyId, startDate, endDate, signature, accountIdsList);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetail(companyId, startDate, endDate, signature, accountIdsList);
|
|
- }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
|
|
|
|
|
|
+ }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
if (accountIdsList != null && !accountIdsList.isEmpty()){
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetailOperator(companyId, startDate,endDate,signature, accountIdsList);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetailOperator(companyId, startDate,endDate,signature, accountIdsList);
|
|
}else{
|
|
}else{
|
|
accountIdsList= byteDanceVideoReportDailyMapper.getAccountIdsByOperatorIdAndMediaId(userId);
|
|
accountIdsList= byteDanceVideoReportDailyMapper.getAccountIdsByOperatorIdAndMediaId(userId);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetailOperator(companyId, startDate,endDate,signature, accountIdsList);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetailOperator(companyId, startDate,endDate,signature, accountIdsList);
|
|
}
|
|
}
|
|
- }else if(roleCode.equals("shot") || roleCode.equals("plan") || roleCode.equals("plane") || roleCode.equals("planeLeader") || roleCode.equals("clip") || roleCode.equals("designTeamLeader")){
|
|
|
|
|
|
+ }else if("shot".equals(roleCode) || "plan".equals(roleCode) || "plane".equals(roleCode) || "planeLeader".equals(roleCode) || "clip".equals(roleCode) || "designTeamLeader".equals(roleCode)){
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetailDesign(companyId, startDate, endDate, signature, accountIdsList);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetailDesign(companyId, startDate, endDate, signature, accountIdsList);
|
|
- }else if(roleCode.equals("designTeamLeader")){
|
|
|
|
|
|
+ }else if("designTeamLeader".equals(roleCode)){
|
|
accountIdsList = byteDanceVideoReportDailyMapper.getAccountIds(companyId, signature);
|
|
accountIdsList = byteDanceVideoReportDailyMapper.getAccountIds(companyId, signature);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetailDesign(companyId, startDate,endDate,signature, accountIdsList);
|
|
mList = byteDanceVideoReportDailyMapper.videoInfoListDetailDesign(companyId, startDate,endDate,signature, accountIdsList);
|
|
}else {
|
|
}else {
|
|
@@ -593,8 +593,8 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
|
|
|
|
|
|
//拥有头条视频报表权限的是 管理员-可看所有公司视频 设计组长-可看所在公司所有视频 设计-可以自己所在项目的所有视频
|
|
//拥有头条视频报表权限的是 管理员-可看所有公司视频 设计组长-可看所在公司所有视频 设计-可以自己所在项目的所有视频
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)
|
|
if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)
|
|
- || roleCode.equals("designTeamLeader") || roleCode.equals("plan") ||
|
|
|
|
- roleCode.equals("plane") || roleCode.equals("clip") || roleCode.equals("shot") || roleCode.equals("planeLeader")
|
|
|
|
|
|
+ || "designTeamLeader".equals(roleCode) || "plan".equals(roleCode) ||
|
|
|
|
+ "plane".equals(roleCode) || "clip".equals(roleCode) || "shot".equals(roleCode) || "planeLeader".equals(roleCode)
|
|
){
|
|
){
|
|
return 1;
|
|
return 1;
|
|
}else{
|
|
}else{
|