|
@@ -79,7 +79,6 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
|
|
List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
|
|
if (Check.isNull(saleTeaMber)) {
|
|
if (Check.isNull(saleTeaMber)) {
|
|
saleTeaMber = Arrays.asList(userId);
|
|
saleTeaMber = Arrays.asList(userId);
|
|
- return Result.error("未查询到人员!");
|
|
|
|
}
|
|
}
|
|
//账户集合
|
|
//账户集合
|
|
List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber);
|
|
List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber);
|
|
@@ -128,7 +127,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
//月消耗
|
|
//月消耗
|
|
String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
- result.put("monthCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
|
|
|
|
+ result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
|
|
//现金消耗 + 环比ROI
|
|
//现金消耗 + 环比ROI
|
|
JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
@@ -140,7 +139,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
//月消耗
|
|
//月消耗
|
|
String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds);
|
|
result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
- result.put("monthCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
|
|
|
|
|
|
+ result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
|
|
//现金消耗 + 环比ROI
|
|
//现金消耗 + 环比ROI
|
|
JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|
|
result.put("realCharged", realCharged.getBigDecimal("realCharged"));
|