فهرست منبع

设计绩效修改

yangzian 2 سال پیش
والد
کامیت
4dbf13013f

+ 14 - 13
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/achievements/mapper/DesignerMapper.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.common.module.achievements.mapper;
 
 import com.alibaba.fastjson.JSONObject;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -35,9 +36,9 @@ public interface DesignerMapper{
      */
     JSONObject  getHotVideoData(@Param("userId")String userId,
                                      @Param("roleName") String roleName,
-                                     @Param("mediaType") String mediaType,
-                                     @Param("yearTime") String yearTime,
-                                     @Param("monthTime") String monthTime);
+                                     @Param("mediaType") Integer mediaType,
+                                     @Param("yearTime") Integer yearTime,
+                                     @Param("monthTime") Integer monthTime);
 
 
     /**
@@ -48,13 +49,13 @@ public interface DesignerMapper{
      * @return
      */
     List<JSONObject>  getDesignerAchievementsBytedance(@Param("userId")String userId,
-                                     @Param("yearTime") String yearTime,
-                                     @Param("monthTime") String monthTime);
+                                     @Param("yearTime") Integer yearTime,
+                                     @Param("monthTime") Integer monthTime);
 
 
      List<JSONObject>  getDesignerAchievementsKuaishou(@Param("userId")String userId,
-                                     @Param("yearTime") String yearTime,
-                                     @Param("monthTime") String monthTime);
+                                     @Param("yearTime") Integer yearTime,
+                                     @Param("monthTime") Integer monthTime);
 
 
 
@@ -64,8 +65,8 @@ public interface DesignerMapper{
      * @param userId
      * @return
      */
-    List<JSONObject>  getDesignerBytedanceAndKuaishouQuaterCost(@Param("userId")String userId,@Param("yearTime") String yearTime,
-                                                                @Param("monthTime") String monthTime);
+    List<JSONObject>  getDesignerBytedanceAndKuaishouQuaterCost(@Param("userId")String userId,@Param("yearTime") Integer yearTime,
+                                                                @Param("monthTime") Integer monthTime);
 
     /**
      * 管理消耗
@@ -74,8 +75,8 @@ public interface DesignerMapper{
      * @param monthTime
      * @return
      */
-    JSONObject  getDesignerManagerLeaderCost(@Param("userId")String userId,@Param("yearTime") String yearTime,
-                                                                @Param("monthTime") String monthTime);
+    JSONObject  getDesignerManagerLeaderCost(@Param("userId")String userId,@Param("yearTime") Integer yearTime,
+                                                                @Param("monthTime") Integer monthTime);
 
     /**
      * 查询人员离职时间
@@ -89,8 +90,8 @@ public interface DesignerMapper{
      * @param userId
      * @return
      */
-    JSONObject  getUserHotMaterialQuarter(@Param("userId")String userId,@Param("yearTime") String yearTime,
-                                          @Param("monthTime") String monthTime);
+    JSONObject  getUserHotMaterialQuarter(@Param("userId")String userId,@Param("yearTime") Integer yearTime,
+                                          @Param("monthTime") Integer monthTime);
 
     /**
      * 绩效- 用户信息修改

+ 1 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/achievements/mapper/xml/DesignerMapper.xml

@@ -44,9 +44,7 @@
         application.hot_material h
         LEFT JOIN `jeecg-boot`.ctop_material_ascription v ON v.material_id = h.signature
         where
-        v.clip_id != v.shot_id
-        AND v.shot_id != v.plan_id
-        AND h.media_id = #{mediaType}
+         h.media_id = #{mediaType}
         AND DATE_FORMAT( h.hot_date, '%Y' ) = #{yearTime}
         AND DATE_FORMAT( h.hot_date, '%m' ) = #{monthTime}
         <if test="roleName == 'clip'.toString()">

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

@@ -99,12 +99,12 @@ public class DesignerServiceImpl implements IDesignerService {
         Map<String,Object> kuaishouMap = new HashMap<>();
         for (String month : quarterStr ){
             //头条
-            JSONObject bytedanceJson = designerMapper.getHotVideoData(userId,roleName,"1",yearTime,month);
+            JSONObject bytedanceJson = designerMapper.getHotVideoData(userId,roleName,1,Integer.valueOf(yearTime),Integer.valueOf(month));
             bytedanceJson.put("monthTime",month);
             byteDanceList.add(bytedanceJson);
             bytedanceMap.put("byteDance",byteDanceList);
             //快手
-            JSONObject kuaishouJson = designerMapper.getHotVideoData(userId,roleName,"2",yearTime,month);
+            JSONObject kuaishouJson = designerMapper.getHotVideoData(userId,roleName,2,Integer.valueOf(yearTime),Integer.valueOf(month));
             kuaishouJson.put("monthTime",month);
             kuaishouList.add(kuaishouJson);
             kuaishouMap.put("kuaishou",kuaishouList);
@@ -130,13 +130,13 @@ public class DesignerServiceImpl implements IDesignerService {
             Map<String,Object> bytedanceMap = new HashMap<>();
             Map<String,Object> kuaishouMap = new HashMap<>();
             //头条
-            List<JSONObject> bytedanceJson = designerMapper.getDesignerAchievementsBytedance(userId,yearTime,month);
+            List<JSONObject> bytedanceJson = designerMapper.getDesignerAchievementsBytedance(userId,Integer.valueOf(yearTime),Integer.valueOf(month));
             bytedanceMap.put("monthTime",month );
             bytedanceMap.put("yearTime",timeMap.get("yearTime")+"" );
             bytedanceMap.put("byteDance",bytedanceJson);
             byteDanceList.add(bytedanceMap);
             //快手
-            List<JSONObject> kuaishouJson = designerMapper.getDesignerAchievementsKuaishou(userId,yearTime,month);
+            List<JSONObject> kuaishouJson = designerMapper.getDesignerAchievementsKuaishou(userId,Integer.valueOf(yearTime),Integer.valueOf(month));
             kuaishouMap.put("monthTime",month );
             bytedanceMap.put("yearTime",timeMap.get("yearTime")+"" );
             kuaishouMap.put("kuaiShou",kuaishouJson);
@@ -251,7 +251,7 @@ public class DesignerServiceImpl implements IDesignerService {
        JSONObject userFrozen = designerMapper.getUserFrozenInfo(userId);
 
        //季度 分媒体 素材消耗
-       List<JSONObject> quarterCost = designerMapper.getDesignerBytedanceAndKuaishouQuaterCost(userId,yearTime,monthTime);
+       List<JSONObject> quarterCost = designerMapper.getDesignerBytedanceAndKuaishouQuaterCost(userId,Integer.valueOf(yearTime),Integer.valueOf(monthTime));
        userFrozen.put("quarterCostList",quarterCost);
 
        //季度素材 总消耗
@@ -259,7 +259,7 @@ public class DesignerServiceImpl implements IDesignerService {
        userFrozen.put("tatolQuarterCost",tatolCost);
 
        //管理消耗
-       JSONObject leaderCost = designerMapper.getDesignerManagerLeaderCost(userId,yearTime,monthTime);
+       JSONObject leaderCost = designerMapper.getDesignerManagerLeaderCost(userId,Integer.valueOf(yearTime),Integer.valueOf(monthTime));
        userFrozen.put("leaderCost",leaderCost.getString("cost"));
 
 
@@ -274,7 +274,7 @@ public class DesignerServiceImpl implements IDesignerService {
        userFrozen.put("materialCostQualifiedFlag",materialCostQualifiedFlag);
 
        //爆款素材数量
-       JSONObject hotVideoNum = designerMapper.getUserHotMaterialQuarter(userId,yearTime,monthTime);
+       JSONObject hotVideoNum = designerMapper.getUserHotMaterialQuarter(userId,Integer.valueOf(yearTime),Integer.valueOf(monthTime));
        int hotVideoN = Check.isNull(hotVideoNum) ? 0 : hotVideoNum.getInteger("hotVideoNum");
        userFrozen.put("hotVideoNum",hotVideoN);
 
@@ -310,11 +310,11 @@ public class DesignerServiceImpl implements IDesignerService {
        for (String month : quarterStr ) {
            JSONObject commissionJson = new JSONObject();
            //头条提成
-           List<JSONObject> bytedanceJson = designerMapper.getDesignerAchievementsBytedance(userId, timeMap.get("yearTime") + "", month);
+           List<JSONObject> bytedanceJson = designerMapper.getDesignerAchievementsBytedance(userId, Integer.valueOf(timeMap.get("yearTime") + ""), Integer.valueOf(month));
            Double bytedanceCommission = bytedanceJson.stream().mapToDouble(json -> json.getDouble("commission")).reduce(Double::sum).orElse(new Double("0"));
 
            //快手提成
-           List<JSONObject> kuaishouJson = designerMapper.getDesignerAchievementsKuaishou(userId, timeMap.get("yearTime") + "", month);
+           List<JSONObject> kuaishouJson = designerMapper.getDesignerAchievementsKuaishou(userId, Integer.valueOf(timeMap.get("yearTime") + ""), Integer.valueOf(month));
            Double kuaishouCommission = kuaishouJson.stream().mapToDouble(json -> json.getDouble("commission")).reduce(Double::sum).orElse(new Double("0"));
 
            commissionJson.put("monthTime", month);