|
@@ -1460,7 +1460,9 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
long nowDate = Long.valueOf(DateUtils.getDateInteger(DateUtils.getDate("yyyy-MM-dd")));
|
|
|
|
|
|
long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
|
|
|
+
|
|
|
long entDate = Long.valueOf(DateUtils.getDateInteger(endTime));
|
|
|
+
|
|
|
//计算环比 时间值 上阶段时间 以及 两个日期之间的 间隔天数
|
|
|
Map<String, String> lastTime = DateUtils.getStartEndTime(startTime, endTime);
|
|
|
long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeStart")));
|
|
@@ -1787,76 +1789,76 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("0.00%");
|
|
|
long now = Long.valueOf(DateUtils.getDateInteger(DateUtils.getDate("yyyy-MM-dd")));
|
|
|
List<KuaiShouOperateProjectVo> listOperate = new ArrayList<>();
|
|
|
- //查询当前人员所有下级
|
|
|
- Set<String> operatorUserIds = getAffiliateId(userId);
|
|
|
- //2022-02-15 ==>> 20220215
|
|
|
- long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
|
|
|
- long entDate = Long.valueOf(DateUtils.getDateInteger(endTime));
|
|
|
-
|
|
|
- //计算环比 时间值 上阶段时间 以及 两个日期之间的 间隔天数
|
|
|
- Map<String, String> lastTime = DateUtils.getStartEndTime(startTime, endTime);
|
|
|
- long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeStart")));
|
|
|
- long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeEnd")));
|
|
|
- Integer daysBetween = Integer.valueOf(lastTime.get("daysBetween")) + 1;
|
|
|
+ //查询当前人员所有下级
|
|
|
+ Set<String> operatorUserIds = getAffiliateId(userId);
|
|
|
+ //2022-02-15 ==>> 20220215
|
|
|
+ long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
|
|
|
+ long entDate = Long.valueOf(DateUtils.getDateInteger(endTime));
|
|
|
|
|
|
- Map<String, Object> parameterMap = new HashMap<>();
|
|
|
- parameterMap.put("startDate", startDate);
|
|
|
- parameterMap.put("endDate", entDate);
|
|
|
- parameterMap.put("lastTimeStart", lastTimeStart);
|
|
|
- parameterMap.put("lastTimeEnd", lastTimeEnd);
|
|
|
- parameterMap.put("userIds", operatorUserIds);
|
|
|
- parameterMap.put("startEqually", DateUtils.getDateInteger(DateUtils.addDayParse(String.valueOf(DateUtils.getDateInteger(startTime)), -7)));
|
|
|
- parameterMap.put("endEqually", DateUtils.getDateInteger(DateUtils.addDayParse(String.valueOf(DateUtils.getDateInteger(endTime)), -7)));
|
|
|
+ //计算环比 时间值 上阶段时间 以及 两个日期之间的 间隔天数
|
|
|
+ Map<String, String> lastTime = DateUtils.getStartEndTime(startTime, endTime);
|
|
|
+ long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeStart")));
|
|
|
+ long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeEnd")));
|
|
|
+ Integer daysBetween = Integer.valueOf(lastTime.get("daysBetween")) + 1;
|
|
|
+
|
|
|
+ Map<String, Object> parameterMap = new HashMap<>();
|
|
|
+ parameterMap.put("startDate", startDate);
|
|
|
+ parameterMap.put("endDate", entDate);
|
|
|
+ parameterMap.put("lastTimeStart", lastTimeStart);
|
|
|
+ parameterMap.put("lastTimeEnd", lastTimeEnd);
|
|
|
+ parameterMap.put("userIds", operatorUserIds);
|
|
|
+ parameterMap.put("startEqually", DateUtils.getDateInteger(DateUtils.addDayParse(String.valueOf(DateUtils.getDateInteger(startTime)), -7)));
|
|
|
+ parameterMap.put("endEqually", DateUtils.getDateInteger(DateUtils.addDayParse(String.valueOf(DateUtils.getDateInteger(endTime)), -7)));
|
|
|
|
|
|
- //头条
|
|
|
- if (mediaType.equals("1")) {
|
|
|
- List<Long> projectIds = materialStareMapper.getBytedanceProjectList(parameterMap);
|
|
|
- if(Check.isNull(projectIds)){
|
|
|
- return listOperate;
|
|
|
- }
|
|
|
- parameterMap.put("projectIds", projectIds);
|
|
|
- PageHelper.startPage(pageNum, pageSize);
|
|
|
- if (startDate == now || entDate == now) {
|
|
|
- parameterMap.put("tableName", "application.bytedance_advertiser_report_hourly_dw");
|
|
|
- parameterMap.put("hour", DateUtils.getNowHour());
|
|
|
- } else {
|
|
|
- parameterMap.put("tableName", "application.bytedance_advertiser_report_daily_dw");
|
|
|
- }
|
|
|
- listOperate = materialStareMapper.getBytedanceOperateProjectInfoNew(parameterMap);
|
|
|
+ //头条
|
|
|
+ if (mediaType.equals("1")) {
|
|
|
+ List<Long> projectIds = materialStareMapper.getBytedanceProjectList(parameterMap);
|
|
|
+ if (Check.isNull(projectIds)) {
|
|
|
+ return listOperate;
|
|
|
}
|
|
|
- //快手
|
|
|
- if (mediaType.equals("2")) {
|
|
|
- List<Long> projectIds = materialStareMapper.getKuaishouProjectList(parameterMap);
|
|
|
- if(Check.isNull(projectIds)){
|
|
|
- return listOperate;
|
|
|
- }
|
|
|
- parameterMap.put("projectIds", projectIds);
|
|
|
- if (startDate == now || entDate == now) {
|
|
|
- parameterMap.put("tableName", "application.kuaishou_account_report_hourly_dw");
|
|
|
- parameterMap.put("hour", DateUtils.getNowHour());
|
|
|
+ parameterMap.put("projectIds", projectIds);
|
|
|
+ PageHelper.startPage(pageNum, pageSize);
|
|
|
+ if (startDate == now || entDate == now) {
|
|
|
+ parameterMap.put("tableName", "application.bytedance_advertiser_report_hourly_dw");
|
|
|
+ parameterMap.put("hour", DateUtils.getNowHour());
|
|
|
+ } else {
|
|
|
+ parameterMap.put("tableName", "application.bytedance_advertiser_report_daily_dw");
|
|
|
+ }
|
|
|
+ listOperate = materialStareMapper.getBytedanceOperateProjectInfoNew(parameterMap);
|
|
|
+ }
|
|
|
+ //快手
|
|
|
+ if (mediaType.equals("2")) {
|
|
|
+ List<Long> projectIds = materialStareMapper.getKuaishouProjectList(parameterMap);
|
|
|
+ if (Check.isNull(projectIds)) {
|
|
|
+ return listOperate;
|
|
|
+ }
|
|
|
+ parameterMap.put("projectIds", projectIds);
|
|
|
+ if (startDate == now || entDate == now) {
|
|
|
+ parameterMap.put("tableName", "application.kuaishou_account_report_hourly_dw");
|
|
|
+ parameterMap.put("hour", DateUtils.getNowHour());
|
|
|
/* //查询 当天有效 上新计划 上新组
|
|
|
JSONObject newEffect = materialStareMapper.getKuaiShouAccountNowBaseByUserId(null, projectIds.get(0)+"", null, now, now);
|
|
|
int newUnitNumNow = 0;
|
|
|
int trustUnitNum = 0;
|
|
|
newUnitNumNow = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
trustUnitNum = Check.isNull(newEffect) ? 0 : newEffect.getInteger("trustUnitNum");//智能托管*/
|
|
|
- } else {
|
|
|
- parameterMap.put("tableName", "application.kuaishou_account_report_daily_dw");
|
|
|
- }
|
|
|
- PageHelper.startPage(pageNum, pageSize);
|
|
|
- listOperate = materialStareMapper.getKuaiShouOperateProjectInfoNew(parameterMap);
|
|
|
- for (KuaiShouOperateProjectVo vo : listOperate) {
|
|
|
- List<JSONObject> adSceneDate = JSONObject.parseArray( vo.getAdSceneDateStr(), JSONObject.class);
|
|
|
- vo.setAdSceneDate(adSceneDate);
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ parameterMap.put("tableName", "application.kuaishou_account_report_daily_dw");
|
|
|
}
|
|
|
- //计算同比 时间值 只支持7天
|
|
|
- if (daysBetween > 7) {
|
|
|
- for (KuaiShouOperateProjectVo projectVo : listOperate) {
|
|
|
- projectVo.setEquallyRate("-");
|
|
|
- }
|
|
|
+ PageHelper.startPage(pageNum, pageSize);
|
|
|
+ listOperate = materialStareMapper.getKuaiShouOperateProjectInfoNew(parameterMap);
|
|
|
+ for (KuaiShouOperateProjectVo vo : listOperate) {
|
|
|
+ List<JSONObject> adSceneDate = JSONObject.parseArray(vo.getAdSceneDateStr(), JSONObject.class);
|
|
|
+ vo.setAdSceneDate(adSceneDate);
|
|
|
}
|
|
|
- return listOperate;
|
|
|
+ }
|
|
|
+ //计算同比 时间值 只支持7天
|
|
|
+ if (daysBetween > 7) {
|
|
|
+ for (KuaiShouOperateProjectVo projectVo : listOperate) {
|
|
|
+ projectVo.setEquallyRate("-");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return listOperate;
|
|
|
}
|
|
|
|
|
|
//===========================================查询下级员工========================
|
|
@@ -1891,25 +1893,13 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
subordinate.add(userId);
|
|
|
return subordinate;
|
|
|
} else {
|
|
|
- result = querySubordinate(subordinate, subordinate, null);
|
|
|
+ //获取其下组员
|
|
|
+ result = materialStareMapper.getSaleDirctorItsTeamMember(userId);
|
|
|
result.add(userId);
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- //递归查询
|
|
|
- private Set<String> querySubordinate(Set<String> leaderIds, Set<String> result, String companyId) {
|
|
|
- if (leaderIds.isEmpty()) {
|
|
|
- return result;
|
|
|
- }
|
|
|
- Set<String> temp = materialStareMapper.querySubordinateRecursive(companyId, leaderIds);
|
|
|
- result.addAll(temp);
|
|
|
- querySubordinate(temp, result, companyId);
|
|
|
- return result;
|
|
|
- }
|
|
|
-//===========================================查询下级员工========================
|
|
|
-
|
|
|
-
|
|
|
//=========================查询下级的项目以及账户===============================================
|
|
|
@Override
|
|
|
public Result<List<JSONObject>> participateListByMediaIdAllSubordinate(JSONObject requestJson) {
|