|
@@ -774,7 +774,8 @@ public class JiaoYangReportController extends BaseController {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
|
|
|
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
- if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation".equals(roleId)) {
|
|
|
|
|
|
|
+ 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".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
@@ -782,7 +783,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
} else {
|
|
} else {
|
|
|
userIds.add(userId);
|
|
userIds.add(userId);
|
|
|
}
|
|
}
|
|
|
- List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
|
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
if (Check.isNull(promoterIds)) {
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return returnJson;
|
|
return returnJson;
|
|
|
}
|
|
}
|
|
@@ -805,6 +806,8 @@ public class JiaoYangReportController extends BaseController {
|
|
|
Long nowDate = DateUtils.strDateToInt(orderStartDate);
|
|
Long nowDate = DateUtils.strDateToInt(orderStartDate);
|
|
|
Long yesDate = DateUtils.strDateToInt(DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1)); // 昨日日期
|
|
Long yesDate = DateUtils.strDateToInt(DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1)); // 昨日日期
|
|
|
Map<String, Object> ratioMap = new HashMap<>();
|
|
Map<String, Object> ratioMap = new HashMap<>();
|
|
|
|
|
+
|
|
|
|
|
+ requestMap.put("promoterIds", promoterIds);
|
|
|
ratioMap.put("nowDate", nowDate);
|
|
ratioMap.put("nowDate", nowDate);
|
|
|
|
|
|
|
|
ratioMap.put("yesDate", yesDate);
|
|
ratioMap.put("yesDate", yesDate);
|
|
@@ -851,7 +854,6 @@ public class JiaoYangReportController extends BaseController {
|
|
|
) {
|
|
) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
|
-
|
|
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
List<Long> userIds = new ArrayList<>();
|