|
@@ -60,15 +60,10 @@ public class JiaoYangDingPanController extends BaseController {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
promoterIds = jiaoYangDingPanService.getPromoterIdsByUserIds(userIds);
|
|
|
- } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
- if ("jy_expert_business".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
- }
|
|
|
- if ("jy_expert_mentor".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByMentorId(userId);
|
|
|
- }
|
|
|
+ } else if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
}
|
|
|
- if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId)) {
|
|
|
+ if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId) && !"jy_expert_mentor".equals(roleId)) {
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
throw new Exception("该用户下未查询到绑定达人");
|
|
|
}
|
|
@@ -132,15 +127,10 @@ public class JiaoYangDingPanController extends BaseController {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
promoterIds = jiaoYangDingPanService.getPromoterIdsByUserIds(userIds);
|
|
|
- } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
- if ("jy_expert_business".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
- }
|
|
|
- if ("jy_expert_mentor".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByMentorId(userId);
|
|
|
- }
|
|
|
+ } else if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
}
|
|
|
- if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId)) {
|
|
|
+ if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId) && !"jy_expert_mentor".equals(roleId)) {
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
throw new Exception("该用户下未查询到绑定达人");
|
|
|
}
|
|
@@ -202,15 +192,10 @@ public class JiaoYangDingPanController extends BaseController {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
promoterIds = jiaoYangDingPanService.getPromoterIdsByUserIds(userIds);
|
|
|
- } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
- if ("jy_expert_business".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
- }
|
|
|
- if ("jy_expert_mentor".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByMentorId(userId);
|
|
|
- }
|
|
|
+ } else if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
}
|
|
|
- if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId)) {
|
|
|
+ if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId) && !"jy_expert_mentor".equals(roleId)) {
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
throw new Exception("该用户下未查询到绑定达人");
|
|
|
}
|
|
@@ -274,15 +259,10 @@ public class JiaoYangDingPanController extends BaseController {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
promoterIds = jiaoYangDingPanService.getPromoterIdsByUserIds(userIds);
|
|
|
- } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
- if ("jy_expert_business".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
- }
|
|
|
- if ("jy_expert_mentor".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByMentorId(userId);
|
|
|
- }
|
|
|
+ } else if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
}
|
|
|
- if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId)) {
|
|
|
+ if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId) && !"jy_expert_mentor".equals(roleId)) {
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
throw new Exception("该用户下未查询到绑定达人");
|
|
|
}
|
|
@@ -394,15 +374,10 @@ public class JiaoYangDingPanController extends BaseController {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
promoterIds = jiaoYangDingPanService.getPromoterIdsByUserIds(userIds);
|
|
|
- } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
- if ("jy_expert_business".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
- }
|
|
|
- if ("jy_expert_mentor".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByMentorId(userId);
|
|
|
- }
|
|
|
+ } else if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
}
|
|
|
- if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId)) {
|
|
|
+ if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId) && !"jy_expert_mentor".equals(roleId)) {
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
throw new Exception("该用户下未查询到绑定达人");
|
|
|
}
|
|
@@ -498,15 +473,10 @@ public class JiaoYangDingPanController extends BaseController {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
promoterIds = jiaoYangDingPanService.getPromoterIdsByUserIds(userIds);
|
|
|
- } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
- if ("jy_expert_business".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
- }
|
|
|
- if ("jy_expert_mentor".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByMentorId(userId);
|
|
|
- }
|
|
|
+ } else if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
}
|
|
|
- if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId)) {
|
|
|
+ if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId) && !"jy_expert_mentor".equals(roleId)) {
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
throw new Exception("该用户下未查询到绑定达人");
|
|
|
}
|
|
@@ -541,7 +511,6 @@ public class JiaoYangDingPanController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@GetMapping("/getDingPanItemList")
|
|
|
@ApiOperation(value = "切片盯盘")
|
|
|
public JSONObject getItemList(Long userId, String startDate, String endDate) {
|
|
@@ -569,15 +538,75 @@ public class JiaoYangDingPanController extends BaseController {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
promoterIds = jiaoYangDingPanService.getPromoterIdsByUserIds(userIds);
|
|
|
- } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
- if ("jy_expert_business".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
+ } else if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
+ }
|
|
|
+ if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId) && !"jy_expert_mentor".equals(roleId)) {
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ throw new Exception("该用户下未查询到绑定达人");
|
|
|
}
|
|
|
- if ("jy_expert_mentor".equals(roleId)) {
|
|
|
- promoterIds = jiaoYangDingPanService.getPromoterIdsByMentorId(userId);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(promoterIds)) {
|
|
|
+ requestMap.put("promoterIds", promoterIds);
|
|
|
+ }
|
|
|
+ Long start = DateUtils.strDateToInt(startDate);
|
|
|
+ Long end = DateUtils.strDateToInt(endDate);
|
|
|
+ requestMap.put("start", start);
|
|
|
+ requestMap.put("end", end);
|
|
|
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ int differDay = DateUtils.differentDaysByMillisecond(simpleDateFormat.parse(startDate), simpleDateFormat.parse(endDate));
|
|
|
+ String lastEndStr = DateUtils.getAnotherDay("yyyy-MM-dd", startDate, -1); // 上一时段结束日期
|
|
|
+ String lastStartStr = DateUtils.getAnotherDay("yyyy-MM-dd", lastEndStr, -differDay); // 上一时段开始日期
|
|
|
+ requestMap.put("lastEnd", DateUtils.strDateToInt(lastEndStr));
|
|
|
+ requestMap.put("lastStart", DateUtils.strDateToInt(lastStartStr));
|
|
|
+ Long nowDate = Long.valueOf(DateUtils.getNowDate("yyyyMMdd"));
|
|
|
+ if (start.equals(nowDate) && end.equals(nowDate)) {
|
|
|
+ Integer nowHour = DateUtils.getNowHour();
|
|
|
+ requestMap.put("nowHour", nowHour);
|
|
|
+ }
|
|
|
+ List<JSONObject> data = jiaoYangDingPanService.getItemList(requestMap);
|
|
|
+ returnJson.put("code", 200);
|
|
|
+ returnJson.put("data", data);
|
|
|
+ returnJson.put("success", true);
|
|
|
+ } catch (Exception e) {
|
|
|
+ returnJson.put("code", 500);
|
|
|
+ returnJson.put("message", e.getMessage());
|
|
|
+ }
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping("/getDingPanTuiGuangUserList")
|
|
|
+ @ApiOperation(value = "切片盯盘")
|
|
|
+ public JSONObject getDingPanTuiGuangUserList(Long userId, String startDate, String endDate) {
|
|
|
+ Map<String, Object> requestMap = new HashMap<>();
|
|
|
+ JSONObject returnJson = new JSONObject();
|
|
|
+ try {
|
|
|
+ if (Check.isNull(userId)) {
|
|
|
+ throw new Exception("请传入用户id");
|
|
|
+ }
|
|
|
+ if (Check.isNull(startDate)) {
|
|
|
+ throw new Exception("请传入开始日期");
|
|
|
+ }
|
|
|
+ if (Check.isNull(endDate)) {
|
|
|
+ throw new Exception("请传入结束日期");
|
|
|
+ }
|
|
|
+ String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
+ // 剪手经理,渠道经理 查询部门下所有成员数据
|
|
|
+ List<Long> promoterIds = new ArrayList<>();
|
|
|
+ if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation_manager".equals(roleId) || "jy_out_operation".equals(roleId)) {
|
|
|
+ List<Long> userIds = new ArrayList<>();
|
|
|
+ if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
+ Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
|
+ userIds = sysDeptService.getDeptUserListByDeptId(deptId);
|
|
|
+ } else {
|
|
|
+ userIds.add(userId);
|
|
|
}
|
|
|
+ promoterIds = jiaoYangDingPanService.getPromoterIdsByUserIds(userIds);
|
|
|
+ } else if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangDingPanService.getPromoterIdsByBusinessId(userId);
|
|
|
}
|
|
|
- if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId)) {
|
|
|
+ if (!"admin".equals(roleId) && !"jy_admnin".equals(roleId) && !"jy_expert_mentor".equals(roleId)) {
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
throw new Exception("该用户下未查询到绑定达人");
|
|
|
}
|
|
@@ -600,7 +629,100 @@ public class JiaoYangDingPanController extends BaseController {
|
|
|
Integer nowHour = DateUtils.getNowHour();
|
|
|
requestMap.put("nowHour", nowHour);
|
|
|
}
|
|
|
- List<JSONObject> data = jiaoYangDingPanService.getItemList(requestMap);
|
|
|
+ List<JSONObject> data = jiaoYangDingPanService.getDingPanTuiGuangUserList(requestMap);
|
|
|
+ returnJson.put("code", 200);
|
|
|
+ returnJson.put("data", data);
|
|
|
+ returnJson.put("success", true);
|
|
|
+ } catch (Exception e) {
|
|
|
+ returnJson.put("code", 500);
|
|
|
+ returnJson.put("message", e.getMessage());
|
|
|
+ }
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping("/getDingPanMentorBusinessList")
|
|
|
+ @ApiOperation(value = "切片盯盘")
|
|
|
+ public JSONObject getDingPanMentorBusinessList(Long userId, String startDate, String endDate) {
|
|
|
+ Map<String, Object> requestMap = new HashMap<>();
|
|
|
+ JSONObject returnJson = new JSONObject();
|
|
|
+ try {
|
|
|
+ if (Check.isNull(userId)) {
|
|
|
+ throw new Exception("请传入用户id");
|
|
|
+ }
|
|
|
+ if (Check.isNull(startDate)) {
|
|
|
+ throw new Exception("请传入开始日期");
|
|
|
+ }
|
|
|
+ if (Check.isNull(endDate)) {
|
|
|
+ throw new Exception("请传入结束日期");
|
|
|
+ }
|
|
|
+ String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
+ // 剪手经理,渠道经理 查询部门下所有成员数据
|
|
|
+ if (!roleId.equals("admin") && !roleId.equals("jy_admin")) {
|
|
|
+ returnJson.put("code", 200);
|
|
|
+ returnJson.put("data", null);
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+
|
|
|
+ Long start = DateUtils.strDateToInt(startDate);
|
|
|
+ Long end = DateUtils.strDateToInt(endDate);
|
|
|
+ requestMap.put("start", start);
|
|
|
+ requestMap.put("end", end);
|
|
|
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ int differDay = DateUtils.differentDaysByMillisecond(simpleDateFormat.parse(startDate), simpleDateFormat.parse(endDate));
|
|
|
+ String lastEndStr = DateUtils.getAnotherDay("yyyy-MM-dd", startDate, -1); // 上一时段结束日期
|
|
|
+ String lastStartStr = DateUtils.getAnotherDay("yyyy-MM-dd", lastEndStr, -differDay); // 上一时段开始日期
|
|
|
+ requestMap.put("lastEnd", DateUtils.strDateToInt(lastEndStr));
|
|
|
+ requestMap.put("lastStart", DateUtils.strDateToInt(lastStartStr));
|
|
|
+ Long nowDate = Long.valueOf(DateUtils.getNowDate("yyyyMMdd"));
|
|
|
+ if (start.equals(nowDate) && end.equals(nowDate)) {
|
|
|
+ Integer nowHour = DateUtils.getNowHour();
|
|
|
+ requestMap.put("nowHour", nowHour);
|
|
|
+ }
|
|
|
+ List<JSONObject> data = jiaoYangDingPanService.getDingPanMentorBusinessList(requestMap);
|
|
|
+ returnJson.put("code", 200);
|
|
|
+ returnJson.put("data", data);
|
|
|
+ returnJson.put("success", true);
|
|
|
+ } catch (Exception e) {
|
|
|
+ returnJson.put("code", 500);
|
|
|
+ returnJson.put("message", e.getMessage());
|
|
|
+ }
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/getTeamDetail")
|
|
|
+ @ApiOperation(value = "切片盯盘")
|
|
|
+ public JSONObject getTeamDetail(Long deptId, String startDate, String endDate) {
|
|
|
+ Map<String, Object> requestMap = new HashMap<>();
|
|
|
+ JSONObject returnJson = new JSONObject();
|
|
|
+ try {
|
|
|
+ if (Check.isNull(deptId)) {
|
|
|
+ throw new Exception("请传入部门id");
|
|
|
+ }
|
|
|
+ if (Check.isNull(startDate)) {
|
|
|
+ throw new Exception("请传入开始日期");
|
|
|
+ }
|
|
|
+ if (Check.isNull(endDate)) {
|
|
|
+ throw new Exception("请传入结束日期");
|
|
|
+ }
|
|
|
+
|
|
|
+ requestMap.put("deptId", deptId);
|
|
|
+ Long start = DateUtils.strDateToInt(startDate);
|
|
|
+ Long end = DateUtils.strDateToInt(endDate);
|
|
|
+ requestMap.put("start", start);
|
|
|
+ requestMap.put("end", end);
|
|
|
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ int differDay = DateUtils.differentDaysByMillisecond(simpleDateFormat.parse(startDate), simpleDateFormat.parse(endDate));
|
|
|
+ String lastEndStr = DateUtils.getAnotherDay("yyyy-MM-dd", startDate, -1); // 上一时段结束日期
|
|
|
+ String lastStartStr = DateUtils.getAnotherDay("yyyy-MM-dd", lastEndStr, -differDay); // 上一时段开始日期
|
|
|
+ requestMap.put("lastEnd", DateUtils.strDateToInt(lastEndStr));
|
|
|
+ requestMap.put("lastStart", DateUtils.strDateToInt(lastStartStr));
|
|
|
+ Long nowDate = Long.valueOf(DateUtils.getNowDate("yyyyMMdd"));
|
|
|
+ if (start.equals(nowDate) && end.equals(nowDate)) {
|
|
|
+ Integer nowHour = DateUtils.getNowHour();
|
|
|
+ requestMap.put("nowHour", nowHour);
|
|
|
+ }
|
|
|
+ List<JSONObject> data = jiaoYangDingPanService.getDingPanMentorBusinessList(requestMap);
|
|
|
returnJson.put("code", 200);
|
|
|
returnJson.put("data", data);
|
|
|
returnJson.put("success", true);
|