Bladeren bron

盯盘运营经理-项目组数据

yangzian 3 jaren geleden
bovenliggende
commit
a148a6245b

+ 7 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/KuaiShouMaterialStareController.java

@@ -509,12 +509,14 @@ public class KuaiShouMaterialStareController {
      * @return
      */
     @GetMapping("/getOperationGroupData")
-    public Result<JSONObject> getOperationGroupData(@RequestParam(name="startTime") String startTime,
+    public Result<JSONObject> getOperationGroupData(
+                                                            @RequestParam(name="userId") String userId,
+                                                            @RequestParam(name="startTime") String startTime,
                                                               @RequestParam(name="endTime") String endTime,
                                                               @RequestParam(name="pageNum",defaultValue = "1") Integer pageNum,
                                                               @RequestParam(name="pageSize",defaultValue = "5") Integer pageSize) {
 
-        return materialStareService.getOperationGroupData(startTime,endTime, pageNum, pageSize);
+        return materialStareService.getOperationGroupData(userId,startTime,endTime, pageNum, pageSize);
     }
 
 
@@ -525,10 +527,11 @@ public class KuaiShouMaterialStareController {
      * @return
      */
     @GetMapping("/exportOperationGroupData")
-    public Result exportOperationGroupData(@RequestParam(name="startTime") String startTime,
+    public Result exportOperationGroupData(@RequestParam(name="userId") String userId,
+                                           @RequestParam(name="startTime") String startTime,
                                                               @RequestParam(name="endTime") String endTime,HttpServletResponse response) {
 
-        return materialStareService.exportOperationGroupData(startTime,endTime,response);
+        return materialStareService.exportOperationGroupData(userId,startTime,endTime,response);
     }
 
 

+ 7 - 0
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/entity/vo/KuaiShouOperateGroupVo.java

@@ -58,5 +58,12 @@ public class KuaiShouOperateGroupVo implements Serializable {
     private long unitNum;//组
 
 
+    public KuaiShouOperateGroupVo() {}
+    public KuaiShouOperateGroupVo(String userId) {
+        this.userId = userId;
+    }
+
+
+
 
 }

+ 2 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/MaterialStareService.java

@@ -55,7 +55,7 @@ public interface MaterialStareService {
     List<JSONObject> getProjectByUserIdAndMediaIdsSubordinate(Set<String> userIds, List<Integer> mediaIds);
     Map<Long, List<JSONObject>> getAccountListByProjectListSubordinate(Set<String> userIds,List<JSONObject> projectList);
 
-    Result getOperationGroupData(String startTime, String endTime, Integer pageNum, Integer pageSize);
-    Result exportOperationGroupData(String startTime, String endTime,HttpServletResponse response);
+    Result getOperationGroupData(String userId,String startTime, String endTime, Integer pageNum, Integer pageSize);
+    Result exportOperationGroupData(String userId,String startTime, String endTime,HttpServletResponse response);
 
 }

+ 30 - 7
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialStareServiceImpl.java

@@ -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) {
 
                 //下级员工