Jelajahi Sumber

设计绩效-接口组合

yangzian 2 tahun lalu
induk
melakukan
c899a796e3

+ 53 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/achievements/controller/DesignerAchievementsController.java

@@ -1,12 +1,19 @@
 package cn.com.ctop.common.module.achievements.controller;
 
 import cn.com.ctop.common.module.achievements.service.IDesignerService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * 设计人员绩效
  *
@@ -29,9 +36,9 @@ public class DesignerAchievementsController {
      * @return
      */
     @GetMapping(value = "/getDesignBasicsInfoList")
-    public Result getDesignBasicsInfoList(@RequestParam(name = "userId") String userId,
-                                          @RequestParam(name = "pageNum",defaultValue = "1") Integer pageNum,
-                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    public PageInfo<JSONObject> getDesignBasicsInfoList(@RequestParam(name = "userId") String userId,
+                                                        @RequestParam(name = "pageNum",defaultValue = "1") Integer pageNum,
+                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
 
         return designerService.getDesignBasicsInfoList(userId,pageNum,pageSize);
 
@@ -45,7 +52,7 @@ public class DesignerAchievementsController {
      * @return
      */
     @GetMapping(value = "/getHotVideoData")
-    public Result getHotVideoData(@RequestParam(name = "userId") String userId) {
+    public List<Map<String,Object>> getHotVideoData(@RequestParam(name = "userId") String userId) {
 
         return designerService.getHotVideoData(userId);
 
@@ -59,7 +66,7 @@ public class DesignerAchievementsController {
      * @return
      */
     @GetMapping(value = "/getDesignerAchievements")
-    public Result getDesignerAchievements(@RequestParam(name = "userId") String userId) {
+    public Map<String,Object> getDesignerAchievements(@RequestParam(name = "userId") String userId) {
         return designerService.getDesignerAchievements(userId);
 
     }
@@ -72,11 +79,12 @@ public class DesignerAchievementsController {
      * @return
      */
     @GetMapping(value = "/getDesignerCommission")
-    public Result getDesignerCommission(@RequestParam(name = "userId") String userId) {
+    public JSONObject getDesignerCommission(@RequestParam(name = "userId") String userId) {
         return designerService.getDesignerCommission(userId);
 
     }
 
+
     /**
      * 修改绩效中的用户部分信息
      *
@@ -91,4 +99,43 @@ public class DesignerAchievementsController {
 
     }
 
+
+    /**
+     * 基础信息+爆款
+     * @param userId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/getDesignerBasicsAndHotVideoInfo")
+    public Result getDesignerCommission(@RequestParam(name = "userId") String userId,
+                                        @RequestParam(name = "yearTime") String yearTime,
+                                        @RequestParam(name = "monthTime") String monthTime,
+                                        @RequestParam(name = "pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+       return designerService.getDesignerBasicsAndHotVideoInfo(userId,yearTime,monthTime,pageNum,pageSize);
+
+    }
+
+
+
+    /**
+     * 基础信息+绩效+提成
+     * @param userId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/getDesignerBasicsAndAchAndComInfo")
+    public Result getDesignerBasicsAndAchAndComInfo(@RequestParam(name = "userId") String userId,
+                                                    @RequestParam(name = "yearTime") String yearTime,
+                                                    @RequestParam(name = "monthTime") String monthTime,
+                                        @RequestParam(name = "pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+       return designerService.getDesignerBasicsAndAchAndComInfo(userId,yearTime,monthTime,pageNum,pageSize);
+
+    }
+
+
+
 }

+ 11 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/achievements/service/IDesignerService.java

@@ -1,8 +1,12 @@
 package cn.com.ctop.common.module.achievements.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
 import org.jeecg.common.api.vo.Result;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 设计人员绩效
  *
@@ -13,14 +17,17 @@ import org.jeecg.common.api.vo.Result;
 public interface IDesignerService{
 
 
-    Result getDesignBasicsInfoList(String userId,int pageNum,int pageSize);
+    PageInfo<JSONObject> getDesignBasicsInfoList(String userId, int pageNum, int pageSize);
 
-    Result getHotVideoData(String userId);
+    List<Map<String,Object>> getHotVideoData(String userId);
 
-    Result getDesignerAchievements(String userId);
+    Map<String,Object> getDesignerAchievements(String userId);
 
-    Result getDesignerCommission(String userId);
+    JSONObject getDesignerCommission(String userId);
 
     Result updateUserHappyProbability(JSONObject jsonObject);
 
+    Result getDesignerBasicsAndHotVideoInfo(String userId,String yearTime,String monthTime,int pageNum,int pageSize);
+    Result getDesignerBasicsAndAchAndComInfo(String userId,String yearTime,String monthTime,int pageNum,int pageSize);
+
 }

+ 42 - 10
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/achievements/service/impl/DesignerServiceImpl.java

@@ -3,6 +3,8 @@ package cn.com.ctop.common.module.achievements.service.impl;
 import cn.com.ctop.common.module.achievements.mapper.DesignerMapper;
 import cn.com.ctop.common.module.achievements.service.IDesignerService;
 import cn.com.ctop.common.module.utils.Check;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -42,7 +44,7 @@ public class DesignerServiceImpl implements IDesignerService {
     private ToDoubleFunction<JSONObject> getJSONObject;
 
     @Override
-    public Result getDesignBasicsInfoList(String userId,int pageNum,int pageSize) {
+    public PageInfo<JSONObject> getDesignBasicsInfoList(String userId,int pageNum,int pageSize) {
         String departName = null;
         Set<String> userIdList = new HashSet<>();
         //查询用户角色
@@ -59,7 +61,8 @@ public class DesignerServiceImpl implements IDesignerService {
         PageHelper.startPage(pageNum,pageSize);
         List<JSONObject> list = designerMapper.getDesignerUserInfo(departName,userIdList);
         PageInfo<JSONObject> pageInfo = new PageInfo<>(list);
-        return Result.successMsg("设计基础信息查询成功",pageInfo);
+
+        return pageInfo;
     }
 
 
@@ -72,7 +75,7 @@ public class DesignerServiceImpl implements IDesignerService {
      * @author: zianY
      */
     @Override
-    public Result getHotVideoData(String userId) {
+    public List<Map<String,Object>> getHotVideoData(String userId) {
         String roleName = null;
         //查询用户角色
         String roleCode = roleService.getRoleCodeByUserId(userId);
@@ -82,8 +85,6 @@ public class DesignerServiceImpl implements IDesignerService {
             roleName = "shot";
         }else if (roleCode.contains("plan")){
             roleName = "plan";
-        }else {
-            return Result.successMsg("请核实人员["+userId+"]角色信息。",userId);
         }
         //取当前时间的季度的月份
         Map<String,Object> timeMap = DateUtils.getCurrentQuarterMonths(DateUtils.dateToStringTime(new Date()));
@@ -107,12 +108,12 @@ public class DesignerServiceImpl implements IDesignerService {
         }
         resultList.add(bytedanceMap);
         resultList.add(kuaishouMap);
-        return Result.successMsg("设计基础信息查询成功",resultList);
+        return resultList;
     }
 
 
    @Override
-    public Result getDesignerAchievements(String userId) {
+    public Map<String,Object> getDesignerAchievements(String userId) {
         //取当前时间的季度的月份
         Map<String,Object> timeMap = DateUtils.getCurrentQuarterMonths(DateUtils.dateToStringTime(new Date()));
         String[] quarterStr = (String[])timeMap.get("quarter");
@@ -138,7 +139,7 @@ public class DesignerServiceImpl implements IDesignerService {
         }
        resultMap.put("byteDanceData",byteDanceList);
        resultMap.put("kuaiShouData",kuaishouList);
-        return Result.successMsg("设计绩效信息查询成功",resultMap);
+        return resultMap;
     }
 
 
@@ -235,7 +236,7 @@ public class DesignerServiceImpl implements IDesignerService {
 
 
    @Override
-    public Result getDesignerCommission(String userId) {
+    public JSONObject getDesignerCommission(String userId) {
         //取当前时间的季度的月份
         Map<String,Object> timeMap = DateUtils.getCurrentQuarterMonths(DateUtils.dateToStringTime(new Date()));
         String[] quarterStr = (String[])timeMap.get("quarter");
@@ -342,7 +343,7 @@ public class DesignerServiceImpl implements IDesignerService {
        Double userHappyGetMoney = totalCommission * coefficient * userHappyProbability;
        userFrozen.put("userHappyGetMoney",userHappyGetMoney);
 
-       return Result.successMsg("查询成功",userFrozen);
+       return userFrozen;
 
 
    }
@@ -365,6 +366,37 @@ public class DesignerServiceImpl implements IDesignerService {
 
 
 
+    @Override
+    public Result getDesignerBasicsAndHotVideoInfo(String userId,String yearTime,String monthTime,int pageNum,int pageSize){
+        //基础信息 + 爆款信息
+        PageInfo<JSONObject> baseics = getDesignBasicsInfoList(userId,pageNum,pageSize);
+        for (JSONObject jsonObject : baseics.getList()) {
+            List<Map<String,Object>> hotVideo = getHotVideoData(jsonObject.getString("userId"));
+            jsonObject.put("hotVideoInfo",hotVideo);
+        }
+        return Result.successMsg("基础+爆款查询成功。",baseics);
+
+
+    }
+
+
+    @Override
+    public Result getDesignerBasicsAndAchAndComInfo(String userId,String yearTime,String monthTime,int pageNum,int pageSize){
+        //基础信息 + 绩效+提成
+        PageInfo<JSONObject> baseics = getDesignBasicsInfoList(userId,pageNum,pageSize);
+        for (JSONObject jsonObject : baseics.getList()) {
+            //绩效
+            Map<String,Object> achievementsMap = getDesignerAchievements(jsonObject.getString("userId"));
+            jsonObject.put("achievementsMap",achievementsMap);
+            //提成
+            JSONObject userFrozen = getDesignerCommission(jsonObject.getString("userId"));
+            jsonObject.put("userFrozen",userFrozen);
+        }
+        return Result.successMsg("基础+绩效+提成查询成功。",baseics);
+    }
+
+
+