|
@@ -470,10 +470,10 @@ public class JiaoYangReportController extends BaseController {
|
|
|
|
|
|
|
|
|
@GetMapping("/getTopItem")
|
|
|
- public TableDataInfo getTopItem(String statDate, Long promoterId) {
|
|
|
+ public TableDataInfo getTopItem(String statDate, Long promoterId,String fieId,String sort) {
|
|
|
Long date = Long.valueOf(statDate.replace("-", ""));
|
|
|
startPage();
|
|
|
- List<JSONObject> list = jiaoYangReportService.getTopItem(date, promoterId);
|
|
|
+ List<JSONObject> list = jiaoYangReportService.getTopItem(date, promoterId,fieId,sort);
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
|
@@ -693,24 +693,6 @@ public class JiaoYangReportController extends BaseController {
|
|
|
) {
|
|
|
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
-
|
|
|
- /*String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
- if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId)) {
|
|
|
- List<Long> userIds = new ArrayList<>();
|
|
|
- if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
|
|
|
- Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
|
- userIds = sysDeptService.getDeptUserListByDeptId(deptId);
|
|
|
- } else {
|
|
|
- userIds.add(userId);
|
|
|
- }
|
|
|
- List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
- if (Check.isNull(promoterIds)) {
|
|
|
- return getDataTable(
|
|
|
- new ArrayList<>()
|
|
|
- );
|
|
|
- }
|
|
|
- requestMap.put("promoterIds", promoterIds);
|
|
|
- }*/
|
|
|
if (dateType == 0) {
|
|
|
|
|
|
if (!Check.isNull(orderStartDate)) {
|