|
@@ -468,6 +468,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
+ List<Long> promoterIds = new ArrayList<>();
|
|
|
if ("jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_out_operation_manager".equals(roleId)) {
|
|
@@ -476,7 +477,18 @@ public class JiaoYangReportController extends BaseController {
|
|
|
} else {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
- List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ return getDataTable(new ArrayList<JSONObject>());
|
|
|
+ }
|
|
|
+ requestMap.put("promoterIds", promoterIds);
|
|
|
+ } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
+ if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
|
|
|
+ }
|
|
|
+ if ("jy_expert_mentor".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
|
|
|
+ }
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return getDataTable(new ArrayList<JSONObject>());
|
|
|
}
|
|
@@ -520,6 +532,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
Long userId) throws IOException {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
+ List<Long> promoterIds = new ArrayList<>();
|
|
|
if ("jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_out_operation_manager".equals(roleId)) {
|
|
@@ -528,7 +541,18 @@ public class JiaoYangReportController extends BaseController {
|
|
|
} else {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
- List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ requestMap.put("promoterIds", promoterIds);
|
|
|
+ } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
+ if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
|
|
|
+ }
|
|
|
+ if ("jy_expert_mentor".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
|
|
|
+ }
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return;
|
|
|
}
|
|
@@ -584,10 +608,12 @@ public class JiaoYangReportController extends BaseController {
|
|
|
export.add(0);
|
|
|
}
|
|
|
export.add(data.getString("userName"));
|
|
|
+ export.add(data.getString("expertMentorName"));
|
|
|
+ export.add(data.getString("expertBusinessName"));
|
|
|
exportList.add(export);
|
|
|
}
|
|
|
}
|
|
|
- String[] headers = {"达人ID", "达人名称", "订单数", "有效单数", "有效率", "付款金额", "有效付款金额", "发货数", "未发货数", "发货率", "绑定人"};
|
|
|
+ String[] headers = {"达人ID", "达人名称", "订单数", "有效单数", "有效率", "付款金额", "有效付款金额", "发货数", "未发货数", "发货率", "绑定人", "导师", "商务"};
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
@@ -805,7 +831,21 @@ public class JiaoYangReportController extends BaseController {
|
|
|
return returnJson;
|
|
|
}
|
|
|
requestMap.put("promoterIds", promoterIds);
|
|
|
+ } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
+ if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
|
|
|
+ }
|
|
|
+ if ("jy_expert_mentor".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
|
|
|
+ }
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+ requestMap.put("promoterIds", promoterIds);
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
if (dateType == 0) {
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
|
Long start = DateUtils.strDateToInt(orderStartDate); //当天开始时间
|
|
@@ -872,6 +912,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
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".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
@@ -880,7 +921,19 @@ public class JiaoYangReportController extends BaseController {
|
|
|
} else {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
- List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+ requestMap.put("promoterIds", promoterIds);
|
|
|
+ } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
+ if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
|
|
|
+ }
|
|
|
+
|
|
|
+ if ("jy_expert_mentor".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
|
|
|
+ }
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return returnJson;
|
|
|
}
|
|
@@ -921,6 +974,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
|
|
|
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".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
@@ -929,11 +983,23 @@ public class JiaoYangReportController extends BaseController {
|
|
|
} else {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
- List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return returnJson;
|
|
|
}
|
|
|
requestMap.put("promoterIds", promoterIds);
|
|
|
+ } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
+ if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
|
|
|
+ }
|
|
|
+ if ("jy_expert_mentor".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
|
|
|
+ }
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+ requestMap.put("promoterIds", promoterIds);
|
|
|
+
|
|
|
}
|
|
|
if (dateType == 0) {
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
@@ -1086,6 +1152,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
Long userId) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
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".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
@@ -1094,11 +1161,23 @@ public class JiaoYangReportController extends BaseController {
|
|
|
} else {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
- List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
|
requestMap.put("promoterIds", promoterIds);
|
|
|
+ } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
+ if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
|
|
|
+ }
|
|
|
+ if ("jy_expert_mentor".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
|
|
|
+ }
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ return new ArrayList<>();
|
|
|
+ }
|
|
|
+ requestMap.put("promoterIds", promoterIds);
|
|
|
+
|
|
|
}
|
|
|
String nowDate = DateUtils.getNowDateStr();
|
|
|
Long start = null;
|
|
@@ -1141,6 +1220,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
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".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
@@ -1149,11 +1229,22 @@ public class JiaoYangReportController extends BaseController {
|
|
|
} else {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
- List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ return new JSONObject();
|
|
|
+ }
|
|
|
+ requestMap.put("promoterIds", promoterIds);
|
|
|
+ } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
|
|
|
+ if ("jy_expert_business".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
|
|
|
+ } else if ("jy_expert_mentor".equals(roleId)) {
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
|
|
|
+ }
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return new JSONObject();
|
|
|
}
|
|
|
requestMap.put("promoterIds", promoterIds);
|
|
|
+
|
|
|
}
|
|
|
String nowDate = DateUtils.getNowDateStr();
|
|
|
String thisCycleEnd = null; // 当前时段结束日期
|