|
@@ -310,17 +310,16 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
@Override
|
|
|
public PageInfo getProjectChargeTop(String userId, String mediaId, String companyId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws Exception {
|
|
|
String roleCode = baseMapper.getRoleCodeByUserId(userId);
|
|
|
- List<Long> compayAllAccountIds = baseMapper.getCompanyAccountIds(companyId, mediaId);
|
|
|
JSONObject data = null;
|
|
|
//销售总监
|
|
|
if ("saleDirector".equals(roleCode)) {
|
|
|
//丁兆明特殊处理
|
|
|
if ("b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
|
|
|
- List<Long> projectIds = baseMapper.querySalesDirectorProjectIds(companyId, mediaId, null);
|
|
|
+ List<Long> accountIds = baseMapper.getCompanyAccountIds(companyId, mediaId);
|
|
|
if (startTime.equals(endTime)) {
|
|
|
- return getProjectDailyCharges(projectIds, mediaId, startTime, null, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, mediaId, startTime, null, pageNo, pageSize);
|
|
|
} else {
|
|
|
- return getProjectDailyCharges(projectIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
}
|
|
|
//查询销售总监及旗下的人员 集
|
|
@@ -329,29 +328,29 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
saleTeaMber = Arrays.asList(userId);
|
|
|
}
|
|
|
//账户集合
|
|
|
- List<Long> projectIds = baseMapper.querySalesDirectorProjectIds(companyId, mediaId, saleTeaMber);
|
|
|
- if (Check.isNull(projectIds)) {
|
|
|
+ List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber);
|
|
|
+ if (Check.isNull(accountIds)) {
|
|
|
throw new Exception("未查询到账户!");
|
|
|
}
|
|
|
if (startTime.equals(endTime)) {
|
|
|
- return getProjectDailyCharges(projectIds, mediaId, startTime, null, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, mediaId, startTime, null, pageNo, pageSize);
|
|
|
} else {
|
|
|
- return getProjectDailyCharges(projectIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
//分公司总经理
|
|
|
} else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
- List<Long> projectIds = baseMapper.querySalesDirectorProjectIds(companyId, mediaId, null);
|
|
|
+ List<Long> accountIds = baseMapper.getCompanyAccountIds(companyId, mediaId);
|
|
|
if (startTime.equals(endTime)) {
|
|
|
- return getProjectDailyCharges(projectIds, mediaId, startTime, null, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, mediaId, startTime, null, pageNo, pageSize);
|
|
|
} else {
|
|
|
- return getProjectDailyCharges(projectIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(accountIds, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
} else {
|
|
|
throw new Exception("该用户角色权限不足!");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private PageInfo getProjectDailyCharges(List<Long> projectIds, String mediaId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws ParseException {
|
|
|
+ private PageInfo getProjectDailyCharges(List<Long> accountIds, String mediaId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws ParseException {
|
|
|
Long days = 1L;
|
|
|
Integer hour = DateUtils.getHour(DateUtils.formatDateTime());
|
|
|
if (endTime == null) {
|
|
@@ -363,16 +362,16 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
|
|
|
//1 头条
|
|
|
if ("1".equals(mediaId)) {
|
|
|
- Long total = baseMapper.queryTtHourProjectTopTotal(projectIds, startTime, endTime);
|
|
|
+ Long total = baseMapper.queryTtHourProjectTopTotal(accountIds, startTime, endTime);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryTtHourProjectTop(projectIds, startTime, endTime, days, hour);
|
|
|
+ List<JSONObject> list = baseMapper.queryTtHourProjectTop(accountIds, startTime, endTime, days, hour);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|
|
|
} else if ("2".equals(mediaId)) {
|
|
|
- Long total = baseMapper.queryKsHourProjectTopTotal(projectIds, startTime, endTime);
|
|
|
+ Long total = baseMapper.queryKsHourProjectTopTotal(accountIds, startTime, endTime);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryKsHourProjectTop(projectIds, startTime, endTime, days, hour);
|
|
|
+ List<JSONObject> list = baseMapper.queryKsHourProjectTop(accountIds, startTime, endTime, days, hour);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|