|
@@ -1302,6 +1302,9 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
for (KuaiShouOperateGroupVo groupVo : operationManagerList) {
|
|
|
//下级员工
|
|
|
Set<String> operatorUserIds = getAffiliateId(groupVo.getUserId());
|
|
|
+ //有消耗的账户
|
|
|
+ operatorUserIds = materialStareMapper.getBytedanceAllOperators(null,DateUtils.getDateInteger(startTime).longValue(),DateUtils.getDateInteger(endTime).longValue(),operatorUserIds);
|
|
|
+
|
|
|
//运营数量
|
|
|
int operationNum = Check.isNull(operatorUserIds) ? 0 : operatorUserIds.size();
|
|
|
groupVo.setOperationNum(operationNum);
|
|
@@ -1309,7 +1312,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
//查询账户数据
|
|
|
List<KuaiShouOperateVo> listOperate= new ArrayList<>();
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
|
- if (daysBetween < 0){
|
|
|
+ if (daysBetween < 1){
|
|
|
//时报
|
|
|
listOperate= materialStareMapper.getKuaiShouOperateInfoHourly(startDate,entDate,operatorUserIds);
|
|
|
}else {
|
|
@@ -1414,12 +1417,16 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
//下级员工
|
|
|
Set<String> operatorUserIds = getAffiliateId(groupVo.getUserId());
|
|
|
+ //有消耗的账户
|
|
|
+ operatorUserIds = materialStareMapper.getBytedanceAllOperators(null,DateUtils.getDateInteger(startTime).longValue(),DateUtils.getDateInteger(endTime).longValue(),operatorUserIds);
|
|
|
+
|
|
|
//运营数量
|
|
|
int operationNum = Check.isNull(operatorUserIds) ? 0 : operatorUserIds.size();
|
|
|
+
|
|
|
groupVo.setOperationNum(operationNum);
|
|
|
//查询账户数据
|
|
|
List<KuaiShouOperateVo> listOperate= new ArrayList<>();
|
|
|
- if (daysBetween < 0){
|
|
|
+ if (daysBetween < 1){
|
|
|
//时报
|
|
|
listOperate= materialStareMapper.getKuaiShouOperateInfoHourly(startDate,entDate,operatorUserIds);
|
|
|
}else {
|