|
@@ -8,10 +8,7 @@ import com.ruixuan.common.utils.Check;
|
|
|
import com.ruixuan.common.utils.DateUtils;
|
|
|
import com.ruixuan.isc.service.IKwaiXiaoDianReportService;
|
|
|
import com.ruixuan.isc.service.IKwaixiaodianItemGetService;
|
|
|
-import com.ruixuan.system.service.ISysDeptService;
|
|
|
import com.ruixuan.system.service.ISysRoleService;
|
|
|
-import com.ruixuan.system.service.ISysUserService;
|
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -77,12 +74,12 @@ public class KwaiXiaoDianReportController {
|
|
|
if (Check.isNull(courtshipPurchaseIds)) {
|
|
|
throw new Exception("此用户未查询到部门成员信息");
|
|
|
}
|
|
|
- List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
+ List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
requestMap.put("itemIds", itemIds);
|
|
|
} else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
|
|
|
List<Long> courtshipPurchaseIds = new ArrayList<>();
|
|
|
courtshipPurchaseIds.add(userId);
|
|
|
- List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
+ List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
requestMap.put("itemIds", itemIds);
|
|
|
}
|
|
|
|
|
@@ -154,12 +151,12 @@ public class KwaiXiaoDianReportController {
|
|
|
if (Check.isNull(courtshipPurchaseIds)) {
|
|
|
throw new Exception("此用户未查询到部门成员信息");
|
|
|
}
|
|
|
- List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
+ List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
requestMap.put("itemIds", itemIds);
|
|
|
} else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
|
|
|
List<Long> courtshipPurchaseIds = new ArrayList<>();
|
|
|
courtshipPurchaseIds.add(userId);
|
|
|
- List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
+ List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
requestMap.put("itemIds", itemIds);
|
|
|
}
|
|
|
|
|
@@ -238,12 +235,12 @@ public class KwaiXiaoDianReportController {
|
|
|
if (Check.isNull(courtshipPurchaseIds)) {
|
|
|
throw new Exception("此用户未查询到部门成员信息");
|
|
|
}
|
|
|
- List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
+ List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
requestMap.put("itemIds", itemIds);
|
|
|
} else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
|
|
|
List<Long> courtshipPurchaseIds = new ArrayList<>();
|
|
|
courtshipPurchaseIds.add(userId);
|
|
|
- List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
+ List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
requestMap.put("itemIds", itemIds);
|
|
|
}
|
|
|
|
|
@@ -307,12 +304,12 @@ public class KwaiXiaoDianReportController {
|
|
|
if (Check.isNull(courtshipPurchaseIds)) {
|
|
|
throw new Exception("此用户未查询到部门成员信息");
|
|
|
}
|
|
|
- List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
+ List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
requestMap.put("itemIds", itemIds);
|
|
|
} else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
|
|
|
List<Long> courtshipPurchaseIds = new ArrayList<>();
|
|
|
courtshipPurchaseIds.add(userId);
|
|
|
- List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
+ List<Long> itemIds = kwaixiaodianItemGetService.getCourtshipPurchaseItemIdsByUserIds(courtshipPurchaseIds);
|
|
|
requestMap.put("itemIds", itemIds);
|
|
|
}
|
|
|
|
|
@@ -441,9 +438,13 @@ public class KwaiXiaoDianReportController {
|
|
|
requestMap.put("deptId", deptId);
|
|
|
requestMap.put("type", type);
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
- if ("industry_sale".equals(roleId) || "industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 销售 查看自己的数据
|
|
|
+ if ("industry_sale".equals(roleId)) { // 销售 查看自己的数据
|
|
|
requestMap.put("userId", userId);
|
|
|
}
|
|
|
+ if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) {
|
|
|
+ requestMap.put("courtshipPurchaseId", userId);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
Long start = DateUtils.strDateToInt(startDate);
|
|
|
Long end = DateUtils.strDateToInt(endDate);
|
|
@@ -498,11 +499,8 @@ public class KwaiXiaoDianReportController {
|
|
|
if (Check.isNull(userIds)) {
|
|
|
throw new Exception("此用户未查询到部门成员信息");
|
|
|
}
|
|
|
- List<Long> itemIds = kwaixiaodianItemGetService.getItemIdsByUserIds(userIds);
|
|
|
- if (Check.isNull(itemIds)) {
|
|
|
- throw new Exception("商品ID为空");
|
|
|
- }
|
|
|
- requestMap.put("itemIds", itemIds);
|
|
|
+ requestMap.put("userIds", userIds);
|
|
|
+
|
|
|
} else if ("industry_sale".equals(roleId)) { // 销售 查看自己的数据
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
userIds.add(userId);
|
|
@@ -516,7 +514,6 @@ public class KwaiXiaoDianReportController {
|
|
|
if (Check.isNull(courtshipPurchaseIds)) {
|
|
|
throw new Exception("此用户未查询到部门成员信息");
|
|
|
}
|
|
|
-
|
|
|
requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
|
|
|
} else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
|
|
|
List<Long> courtshipPurchaseIds = new ArrayList<>();
|