|
@@ -470,25 +470,46 @@ public class KwaixiaodianItemGetController extends BaseController {
|
|
}
|
|
}
|
|
requestMap.put("companyId", companyId);
|
|
requestMap.put("companyId", companyId);
|
|
} else if ("industry_sale_manager".equals(roleId)) { // 销售经理角色查看部门下所有成员数据
|
|
} else if ("industry_sale_manager".equals(roleId)) { // 销售经理角色查看部门下所有成员数据
|
|
- List<Long> userIds = kwaixiaodianItemGetService.getUserIds(userId);
|
|
|
|
|
|
+ /* List<Long> userIds = kwaixiaodianItemGetService.getUserIds(userId);
|
|
if (Check.isNull(userIds)) {
|
|
if (Check.isNull(userIds)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- requestMap.put("userIds", userIds);
|
|
|
|
|
|
+ requestMap.put("userIds", userIds);*/
|
|
|
|
+ companyId = kwaixiaodianItemGetService.getCompanyId(userId);
|
|
|
|
+ if (Check.isNull(companyId)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ requestMap.put("companyId", companyId);
|
|
} else if ("industry_sale".equals(roleId)) { // 销售 查看自己的数据
|
|
} else if ("industry_sale".equals(roleId)) { // 销售 查看自己的数据
|
|
- List<Long> userIds = new ArrayList<>();
|
|
|
|
|
|
+ /*List<Long> userIds = new ArrayList<>();
|
|
userIds.add(userId);
|
|
userIds.add(userId);
|
|
- requestMap.put("userIds", userIds);
|
|
|
|
|
|
+ requestMap.put("userIds", userIds);*/
|
|
|
|
+ companyId = kwaixiaodianItemGetService.getCompanyId(userId);
|
|
|
|
+ if (Check.isNull(companyId)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ requestMap.put("companyId", companyId);
|
|
} else if ("industry_courtship_manager".equals(roleId) || "industry_purchase_manager".equals(roleId)) { // 招商、采购经理角色查看部门下所有成员数据
|
|
} else if ("industry_courtship_manager".equals(roleId) || "industry_purchase_manager".equals(roleId)) { // 招商、采购经理角色查看部门下所有成员数据
|
|
- List<Long> courtshipPurchaseIds = kwaixiaodianItemGetService.getUserIds(userId);
|
|
|
|
|
|
+ /* List<Long> courtshipPurchaseIds = kwaixiaodianItemGetService.getUserIds(userId);
|
|
if (Check.isNull(courtshipPurchaseIds)) {
|
|
if (Check.isNull(courtshipPurchaseIds)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
|
|
|
|
|
|
+ requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);*/
|
|
|
|
+ companyId = kwaixiaodianItemGetService.getCompanyId(userId);
|
|
|
|
+ if (Check.isNull(companyId)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ requestMap.put("companyId", companyId);
|
|
} else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
|
|
} else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
|
|
- List<Long> courtshipPurchaseIds = new ArrayList<>();
|
|
|
|
|
|
+ /* List<Long> courtshipPurchaseIds = new ArrayList<>();
|
|
courtshipPurchaseIds.add(userId);
|
|
courtshipPurchaseIds.add(userId);
|
|
- requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
|
|
|
|
|
|
+ requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);*/
|
|
|
|
+
|
|
|
|
+ companyId = kwaixiaodianItemGetService.getCompanyId(userId);
|
|
|
|
+ if (Check.isNull(companyId)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ requestMap.put("companyId", companyId);
|
|
}
|
|
}
|
|
|
|
|
|
if (!Check.isNull(shopId)) {
|
|
if (!Check.isNull(shopId)) {
|
|
@@ -530,6 +551,7 @@ public class KwaixiaodianItemGetController extends BaseController {
|
|
export.add(data.getString("itemTitle"));
|
|
export.add(data.getString("itemTitle"));
|
|
export.add(data.getString("price"));
|
|
export.add(data.getString("price"));
|
|
export.add(data.getString("itemType"));
|
|
export.add(data.getString("itemType"));
|
|
|
|
+ export.add(data.getString("shopName"));
|
|
export.add(data.getString("orderNum"));
|
|
export.add(data.getString("orderNum"));
|
|
export.add(data.getString("orderNumRate"));
|
|
export.add(data.getString("orderNumRate"));
|
|
export.add(data.getString("validOrderNum"));
|
|
export.add(data.getString("validOrderNum"));
|
|
@@ -547,7 +569,7 @@ public class KwaixiaodianItemGetController extends BaseController {
|
|
exportList.add(export);
|
|
exportList.add(export);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- String[] headers = {"商品ID", "商品标题", "商品价格", "类型", "单量", "单量环比", "有效单量", "有效率", "失效单量", "GVM", "有效GMV", "发货数", "发货率", "未发货数", "运费", "绑定人", "招商/采购", "商品图片"};
|
|
|
|
|
|
+ String[] headers = {"商品ID", "商品标题", "商品价格", "类型", "店铺", "单量", "单量环比", "有效单量", "有效率", "失效单量", "GVM", "有效GMV", "发货数", "发货率", "未发货数", "运费", "绑定人", "招商/采购", "商品图片"};
|
|
OutputStream os = response.getOutputStream();
|
|
OutputStream os = response.getOutputStream();
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|