|
@@ -76,7 +76,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
//丁兆明特殊处理
|
|
|
if ("b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
|
|
|
//账户集合
|
|
|
- List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, null);
|
|
|
+ List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null);
|
|
|
if (Check.isNull(accountIds)) {
|
|
|
return Result.error("未查询到账户!");
|
|
|
}
|
|
@@ -87,7 +87,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
|
|
|
saleTeaMber.add(userId);
|
|
|
//账户集合
|
|
|
- List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, saleTeaMber, null);
|
|
|
+ List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, saleTeaMber);
|
|
|
if (Check.isNull(accountIds)) {
|
|
|
return Result.error("未查询到账户!");
|
|
|
}
|
|
@@ -96,7 +96,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
//分公司总经理
|
|
|
} else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
//账户集合
|
|
|
- List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, null);
|
|
|
+ List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null);
|
|
|
if (Check.isNull(accountIds)) {
|
|
|
return Result.error("未查询到账户!");
|
|
|
}
|
|
@@ -358,8 +358,6 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
|
|
|
@Override
|
|
|
public PageInfo getProjectChargeTop(String userId, String mediaId, String startTime, String endTime, String operate, Integer pageNo, Integer pageSize) throws Exception {
|
|
|
- List<String> operateUser = new ArrayList<>();
|
|
|
-
|
|
|
//账户集合
|
|
|
List<Long> accountIds = null;
|
|
|
//当天日期
|
|
@@ -370,48 +368,48 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
if ("saleDirector".equals(roleCode) || "saleAm".equals(roleCode)) {
|
|
|
//丁兆明特殊处理
|
|
|
if ("b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
|
|
|
- accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, operateUser);
|
|
|
+ accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null);
|
|
|
if (Check.isNull(accountIds)) {
|
|
|
throw new Exception("未查询到账户!");
|
|
|
}
|
|
|
if (startTime.equals(endTime) && today.equals(startTime)) {
|
|
|
- return getProjectDailyCharges(accountIds, null, mediaId, startTime, null, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(null, accountIds, null, mediaId, startTime, null, pageNo, pageSize);
|
|
|
} else if (startTime.equals(endTime)) {
|
|
|
- return getProjectDailyCharges(accountIds, null, mediaId, startTime, startTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(null, accountIds, null, mediaId, startTime, startTime, pageNo, pageSize);
|
|
|
} else {
|
|
|
- return getProjectDailyCharges(accountIds, null, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(null, accountIds, null, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
}
|
|
|
//查询销售总监及旗下的人员 集
|
|
|
List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
|
|
|
saleTeaMber.add(userId);
|
|
|
- accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, saleTeaMber, operateUser);
|
|
|
+ accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, saleTeaMber);
|
|
|
if (startTime.equals(endTime) && today.equals(startTime)) {
|
|
|
- return getProjectDailyCharges(accountIds, null, mediaId, startTime, null, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(saleTeaMber, accountIds, null, mediaId, startTime, null, pageNo, pageSize);
|
|
|
} else if (startTime.equals(endTime)) {
|
|
|
- return getProjectDailyCharges(accountIds, null, mediaId, startTime, startTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(saleTeaMber, accountIds, null, mediaId, startTime, startTime, pageNo, pageSize);
|
|
|
} else {
|
|
|
- return getProjectDailyCharges(accountIds, null, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(saleTeaMber, accountIds, null, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
//分公司总经理
|
|
|
} else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
- accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, operateUser);
|
|
|
+ accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null);
|
|
|
if (Check.isNull(accountIds)) {
|
|
|
throw new Exception("未查询到账户!");
|
|
|
}
|
|
|
if (startTime.equals(endTime) && today.equals(startTime)) {
|
|
|
- return getProjectDailyCharges(accountIds, null, mediaId, startTime, null, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(null, accountIds, null, mediaId, startTime, null, pageNo, pageSize);
|
|
|
} else if (startTime.equals(endTime)) {
|
|
|
- return getProjectDailyCharges(accountIds, null, mediaId, startTime, startTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(null, accountIds, null, mediaId, startTime, startTime, pageNo, pageSize);
|
|
|
} else {
|
|
|
- return getProjectDailyCharges(accountIds, null, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
+ return getProjectDailyCharges(null, accountIds, null, mediaId, startTime, endTime, pageNo, pageSize);
|
|
|
}
|
|
|
} else {
|
|
|
throw new Exception("该用户角色权限不足!");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private PageInfo getProjectDailyCharges(List<Long> accountIds, String companyId, String mediaId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws ParseException {
|
|
|
+ private PageInfo getProjectDailyCharges(List<String> saleTeaMber, List<Long> accountIds, String companyId, String mediaId, String startTime, String endTime, Integer pageNo, Integer pageSize) throws ParseException {
|
|
|
Long days = 1L;
|
|
|
Integer hour = DateUtils.getHour(DateUtils.formatDateTime());
|
|
|
if (endTime == null) {
|
|
@@ -422,16 +420,16 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
}
|
|
|
//1 头条
|
|
|
if ("1".equals(mediaId)) {
|
|
|
- Long total = baseMapper.queryTtHourProjectTopTotal(accountIds, startTime, endTime, companyId);
|
|
|
+ Long total = baseMapper.queryTtHourProjectTopTotal(saleTeaMber, startTime, endTime, companyId);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryTtHourProjectTop(accountIds, startTime, endTime, days, hour, companyId);
|
|
|
+ List<JSONObject> list = baseMapper.queryTtHourProjectTop(saleTeaMber, accountIds, startTime, endTime, days, hour, companyId);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|
|
|
} else if ("2".equals(mediaId)) {
|
|
|
- Long total = baseMapper.queryKsHourProjectTopTotal(accountIds, startTime, endTime, companyId);
|
|
|
+ Long total = baseMapper.queryKsHourProjectTopTotal(saleTeaMber, startTime, endTime, companyId);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
- List<JSONObject> list = baseMapper.queryKsHourProjectTop(accountIds, startTime, endTime, days, hour, companyId);
|
|
|
+ List<JSONObject> list = baseMapper.queryKsHourProjectTop(saleTeaMber, accountIds, startTime, endTime, days, hour, companyId);
|
|
|
PageInfo pageInfo = new PageInfo(list);
|
|
|
pageInfo.setTotal(total);
|
|
|
return pageInfo;
|