Selaa lähdekoodia

媒体类型修改 1-头条 2-快手

hcst_sunzhen 5 vuotta sitten
vanhempi
commit
1a5422d952

+ 8 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PerformanceServiceImpl2.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.system.service.impl;
 
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
-import cn.com.ctop.performanceappraisal.service.IOptimizerConfigService;
 import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
 import cn.com.ctop.planeprojectcost.mapper.PlaneProjectCostMapper;
 import cn.com.ctop.userefficientvideomap.entity.*;
@@ -326,7 +325,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         //循环前30%有绩效的人数并计算其绩效,并入库
         for (int i = 0; i <= top30 - 1; i++) {
             //总消耗--获取这个人所在项目的总消耗
-            BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(planList.get(i).getUserId(), startTime, endTime);
+            BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByPlanId(planList.get(i).getUserId(), startTime, endTime);
             //总绩效=总消耗*提点比例(5‰)*提成比例(编导40%)
             BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.005")).multiply(new BigDecimal("0.4"));
 
@@ -351,7 +350,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         //循环中间50%有绩效的人,计算绩效并入库
         for (int i = 0; i <= middle50 - 1; i++) {
             //总消耗--获取这个人所在项目的总消耗
-            BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(planList.get(i).getUserId(), startTime, endTime);
+            BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByPlanId(planList.get(i).getUserId(), startTime, endTime);
             //总绩效=总消耗*提点比例(3‰)*提成比例(编导40%)
             BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.003")).multiply(new BigDecimal("0.4"));
 
@@ -399,7 +398,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         //循环前30%有绩效的人数并计算其绩效,并入库
         for (int i = 0; i <= shotTop30 - 1; i++) {
             //总消耗--获取这个人所在项目的总消耗
-            BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(shotList.get(i).getUserId(), startTime, endTime);
+            BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByShotId(shotList.get(i).getUserId(), startTime, endTime);
             //总绩效=总消耗*提点比例(5‰)*提成比例(拍摄10%)
             BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.005")).multiply(new BigDecimal("0.1"));
 
@@ -424,7 +423,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         //循环中间50%有绩效的人,计算绩效并入库
         for (int i = 0; i <= shotMiddle50 - 1; i++) {
             //总消耗--获取这个人所在项目的总消耗
-            BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(shotList.get(i).getUserId(), startTime, endTime);
+            BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByShotId(shotList.get(i).getUserId(), startTime, endTime);
             //总绩效=总消耗*提点比例(3‰)*提成比例(拍摄10%)
             BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.003")).multiply(new BigDecimal("0.1"));
 
@@ -472,7 +471,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         //循环前30%有绩效的人数并计算其绩效,并入库
         for (int i = 0; i <= clipTop30 - 1; i++) {
             //总消耗--获取这个人所在项目的总消耗
-            BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(clipList.get(i).getUserId(), startTime, endTime);
+            BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByClipId(clipList.get(i).getUserId(), startTime, endTime);
             //总绩效=总消耗*提点比例(5‰)*提成比例(剪辑30%)
             BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.005")).multiply(new BigDecimal("0.3"));
 
@@ -497,7 +496,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
         //循环中间50%有绩效的人,计算绩效并入库
         for (int i = 0; i <= clipMiddle50 - 1; i++) {
             //总消耗--获取这个人所在项目的总消耗
-            BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(clipList.get(i).getUserId(), startTime, endTime);
+            BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByClipId(clipList.get(i).getUserId(), startTime, endTime);
             //总绩效=总消耗*提点比例(3‰)*提成比例(剪辑30%)
             BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.003")).multiply(new BigDecimal("0.3"));
 
@@ -928,12 +927,12 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
             performance.setRoleId(userDto.getRoleId());
             performance.setQuarter(thisQuarter);
             performance.setYear(thisYear);
-            performance.setCommissionRate(new BigDecimal("0.002"));
+            performance.setCommissionRate(new BigDecimal("0.002")); //千分之
             performance.setTotalCost(totalCost);
             performance.setTotalPerformance(totalPerformance);
             performance.setStartTime(startTime);
             performance.setEndTime(endTime);
-            performance.setRoleCommissionRate(new BigDecimal("20"));
+            performance.setRoleCommissionRate(new BigDecimal("20"));  //百分之
             performance.setUserId(userDto.getUserId());
             performanceMapper.insert(performance);
         }

+ 2 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerConfig.java

@@ -35,8 +35,8 @@ public class OptimizerConfig {
     /**
      * 媒体类型
      */
-    @Excel(name = "媒体类型", width = 15)
-    @ApiModelProperty(value = "媒体类型")
+    @Excel(name = "媒体类型1_头条2_快手", width = 15)
+    @ApiModelProperty(value = "媒体类型1_头条2_快手")
     private Integer appType;
     /**
      * 媒体任务

+ 3 - 3
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java

@@ -104,9 +104,9 @@ public class Performance {
     /**
      * 1_快手2_抖音
      */
-    @Excel(name = "媒体类型", width = 15)
-    @ApiModelProperty(value = "媒体类型")
-    @Dict(dicCode = "media_type")
+    @Excel(name = "媒体类型1_头条2_快手", width = 15)
+    @ApiModelProperty(value = "媒体类型1_头条2_快手")
+    @Dict(dicCode = "app_type")
     private Integer appType;
     /**
      * 创建时间

+ 2 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceOptimizer.java

@@ -72,8 +72,8 @@ public class PerformanceOptimizer {
     /**
      * 媒体类型
      */
-    @Excel(name = "媒体类型", width = 15)
-    @ApiModelProperty(value = "媒体类型")
+    @Excel(name = "媒体类型1_头条2_快手", width = 15)
+    @ApiModelProperty(value = "媒体类型1_头条2_快手")
     private Integer appType;
     /**
      * createTime

+ 2 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java

@@ -61,8 +61,8 @@ public class RolePerformancRraise {
     /**
      * 1:快手 2:头条
      */
-    @Excel(name = "媒体类型", width = 15)
-    @ApiModelProperty(value = "媒体类型")
+    @Excel(name = "媒体类型1_头条2_快手", width = 15)
+    @ApiModelProperty(value = "媒体类型1_头条2_快手")
     @Dict(dicCode = "media_type")
     private Integer appType;
     /**

+ 2 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java

@@ -56,8 +56,8 @@ public class RolePerformanceCommission {
     /**
      * 1:快手  2:头条
      */
-    @Excel(name = "媒体类型", width = 15)
-    @ApiModelProperty(value = "媒体类型")
+    @Excel(name = "媒体类型1_头条2_快手", width = 15)
+    @ApiModelProperty(value = "媒体类型1_头条2_快手")
     @Dict(dicCode = "media_type")
     private Integer appType;
 

+ 3 - 3
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/entity/PlaneProjectCost.java

@@ -44,9 +44,9 @@ public class PlaneProjectCost {
 	@Excel(name = "项目消耗", width = 15)
     @ApiModelProperty(value = "项目消耗")
 	private java.math.BigDecimal projectCost;
-	/**1_快手2_抖音*/
-	@Excel(name = "1_快手2_抖音", width = 15)
-    @ApiModelProperty(value = "1_快手2_抖音")
+	/**1_头条2_快手*/
+	@Excel(name = "1_头条2_快手", width = 15)
+    @ApiModelProperty(value = "1_头条2_快手")
 	private Integer appType;
 	/**项目总消耗*/
 	@Excel(name = "项目总消耗", width = 15)

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/SysRole.java

@@ -46,7 +46,7 @@ public class SysRole implements Serializable {
     private String roleCode;
 
     /**
-          * 描述
+     * 描述
      */
     @Excel(name="描述",width=60)
     private String description;

+ 5 - 8
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserEfficientVideoMap.java

@@ -1,20 +1,17 @@
 package cn.com.ctop.userefficientvideomap.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.util.Date;
+
 /**
  * 有效视频与角色对应表
  * @author jeecg-boot
@@ -60,9 +57,9 @@ public class UserEfficientVideoMap {
 	@Excel(name = "计算日期", width = 15)
 	@ApiModelProperty(value = "计算日期")
 	private Date calcDate;
-	/**媒体类型1_快手2_头条*/
-	@Excel(name = "媒体类型1_快手2_头条", width = 15)
-    @ApiModelProperty(value = "媒体类型1_快手2_头条")
+	/**媒体类型1_头条2_快手*/
+	@Excel(name = "媒体类型1_头条2_快手", width = 15)
+    @ApiModelProperty(value = "媒体类型1_头条2_快手")
 	private Integer appType;
 	/**createTime*/
     @ApiModelProperty(value = "createTime")