Переглянути джерело

Merge remote-tracking branch 'origin/master'

zhaoxian 2 роки тому
батько
коміт
3388971444

+ 12 - 33
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/MaterialDataController.java

@@ -70,7 +70,7 @@ public class MaterialDataController {
     //分项目数据
     @GetMapping("/getProjectData")
     public Result<Object> getProjectData(Long mediaId, String userId, String startDate, String endDate, String role, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-    // role  前端传 只有角色为 剪辑 拍摄 编导才传此参数  默认是 剪辑:clip
+        // role  前端传 只有角色为 剪辑 拍摄 编导才传此参数  默认是 剪辑:clip
         JSONObject returnJson = new JSONObject();
         try {
             Map<String, Object> requestMap = new HashMap<>();
@@ -84,17 +84,16 @@ public class MaterialDataController {
                 if ("designTeamLeader".equals(roleCode)) { // 设计组长查看自己和下级的数据
                     requestMap.put("leaderId", userId);
                 } else {
-                    if ("clip".equals(role)) { // 剪辑查看自己角色为剪辑的数据
+                    if ("clip".equals(role)) {
                         requestMap.put("clipId", userId);
-                    }
-                    if ("plan".equals(role)) {
+                    } else if ("plan".equals(role)) {
                         requestMap.put("planId", userId);
-                    }
-                    if ("shot".equals(role)) {
+                    } else if ("shot".equals(role)) {
                         requestMap.put("shotId", userId);
                     }
                 }
             }
+
             Long start = Long.valueOf(startDate.replace("-", ""));
             Long end = Long.valueOf(endDate.replace("-", ""));
             requestMap.put("start", start);
@@ -118,7 +117,7 @@ public class MaterialDataController {
 
     // 分团队数据
     @GetMapping("/getTeamData")
-    public Result<Object> getTeamData(Long mediaId, String userId, String startDate, String endDate,  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    public Result<Object> getTeamData(Long mediaId, String userId, String startDate, String endDate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         // 只有公司负责人有此权限
         JSONObject returnJson = new JSONObject();
         try {
@@ -152,7 +151,6 @@ public class MaterialDataController {
     }
 
 
-
     //分成员数据
     @GetMapping("/getUserData")
     public Result<Object> getUserData(Long mediaId, String userId, String startDate, String endDate, String role, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@@ -171,13 +169,11 @@ public class MaterialDataController {
                 if ("designTeamLeader".equals(roleCode)) { // 设计组长查看自己和下级的数据
                     requestMap.put("leaderId", userId);
                 } else {
-                    if ("clip".equals(role)) { // 剪辑查看自己角色为剪辑的数据
+                    if ("clip".equals(role)) {
                         requestMap.put("clipId", userId);
-                    }
-                    if ("plan".equals(role)) {
+                    } else if ("plan".equals(role)) {
                         requestMap.put("planId", userId);
-                    }
-                    if ("shot".equals(role)) {
+                    } else if ("shot".equals(role)) {
                         requestMap.put("shotId", userId);
                     }
                 }
@@ -204,9 +200,6 @@ public class MaterialDataController {
     }
 
 
-
-
-
     //视频数据
     @GetMapping("/getVideoData")
     public Result<Object> getVideoData(Long mediaId, String userId, String startDate, String endDate, String role, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@@ -225,13 +218,11 @@ public class MaterialDataController {
                 if ("designTeamLeader".equals(roleCode)) { // 设计组长查看自己和下级的数据
                     requestMap.put("leaderId", userId);
                 } else {
-                    if ("clip".equals(role)) { // 剪辑查看自己角色为剪辑的数据
+                    if ("clip".equals(role)) {
                         requestMap.put("clipId", userId);
-                    }
-                    if ("plan".equals(role)) {
+                    } else if ("plan".equals(role)) {
                         requestMap.put("planId", userId);
-                    }
-                    if ("shot".equals(role)) {
+                    } else if ("shot".equals(role)) {
                         requestMap.put("shotId", userId);
                     }
                 }
@@ -258,18 +249,6 @@ public class MaterialDataController {
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
     private Map<String, Object> getRequestMap(Long mediaId, String userId, String startDate, String endDate) {
         Map<String, Object> requestMap = new HashMap<>();
         if ("4aba62011120ac565c7f2b9f8f4aa96b".equals(userId) || "b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId) || "a6abfea0f27843bf8595a234410afb04".equals(userId) || "e9d527b2b6854a1ea0cc3167fc6a27d0".equals(userId) || "e9ca23d68d884d4ebb19d07889727dae".equals(userId)) { // 如果当前登录人是老板、丁总、王垒、管理员 查看所有数据