|
@@ -1085,7 +1085,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
* @time: 2022/8/31 15:16
|
|
|
*/
|
|
|
@Override
|
|
|
- public Result getOperationGroupData(String startTime,String endTime,Integer pageNum,Integer pageSize) {
|
|
|
+ public Result getOperationGroupData(String userId,String startTime,String endTime,Integer pageNum,Integer pageSize) {
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("0.00%");
|
|
|
try {
|
|
|
long nowDate = Long.valueOf(DateUtils.getDateInteger(DateUtils.getDate("yyyy-MM-dd")));
|
|
@@ -1097,9 +1097,21 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeStart")));
|
|
|
long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeEnd")));
|
|
|
Integer daysBetween = Integer.valueOf(lastTime.get("daysBetween"))+1;
|
|
|
- PageHelper.startPage(pageNum,pageSize);
|
|
|
- //查询运营经理
|
|
|
- List<KuaiShouOperateGroupVo> operationManagerList = materialStareMapper.getOperationManagerUser();
|
|
|
+
|
|
|
+ //查询用户角色
|
|
|
+ String roleCode = materialStareMapper.getRoleCodeByUserId(userId);
|
|
|
+
|
|
|
+ List<KuaiShouOperateGroupVo> operationManagerList = new ArrayList<>();
|
|
|
+ if ("admin".equals(roleCode)) {
|
|
|
+ PageHelper.startPage(pageNum,pageSize);
|
|
|
+ //查询运营经理
|
|
|
+ operationManagerList = materialStareMapper.getOperationManagerUser();
|
|
|
+ }else if (roleCode.contains("OperationManager")){
|
|
|
+ operationManagerList.add(new KuaiShouOperateGroupVo(userId));
|
|
|
+ }else {
|
|
|
+ Result.successMsg("运营组列表数据查询成功。",null);
|
|
|
+ }
|
|
|
+
|
|
|
for (KuaiShouOperateGroupVo groupVo : operationManagerList) {
|
|
|
|
|
|
//下级员工
|
|
@@ -1172,7 +1184,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
}
|
|
|
|
|
|
|
|
|
- public Result exportOperationGroupData(String startTime,String endTime, HttpServletResponse response) {
|
|
|
+ public Result exportOperationGroupData(String userId,String startTime,String endTime, HttpServletResponse response) {
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("0.00%");
|
|
|
try {
|
|
|
long nowDate = Long.valueOf(DateUtils.getDateInteger(DateUtils.getDate("yyyy-MM-dd")));
|
|
@@ -1185,8 +1197,19 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeEnd")));
|
|
|
Integer daysBetween = Integer.valueOf(lastTime.get("daysBetween"))+1;
|
|
|
|
|
|
- //查询运营经理
|
|
|
- List<KuaiShouOperateGroupVo> operationManagerList = materialStareMapper.getOperationManagerUser();
|
|
|
+ //查询用户角色
|
|
|
+ String roleCode = materialStareMapper.getRoleCodeByUserId(userId);
|
|
|
+
|
|
|
+ List<KuaiShouOperateGroupVo> operationManagerList = new ArrayList<>();
|
|
|
+ if ("admin".equals(roleCode)) {
|
|
|
+ //查询运营经理
|
|
|
+ operationManagerList = materialStareMapper.getOperationManagerUser();
|
|
|
+ }else if (roleCode.contains("OperationManager")){
|
|
|
+ operationManagerList.add(new KuaiShouOperateGroupVo(userId));
|
|
|
+ }else {
|
|
|
+ Result.successMsg("运营组列表数据查询成功。",null);
|
|
|
+ }
|
|
|
+
|
|
|
for (KuaiShouOperateGroupVo groupVo : operationManagerList) {
|
|
|
|
|
|
//下级员工
|