|  | @@ -18,39 +18,39 @@ import java.util.List;
 | 
	
		
			
				|  |  |  @Component
 | 
	
		
			
				|  |  |  public interface UserEfficientVideoMapMapper extends BaseMapper<UserEfficientVideoMap> {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    List<EffiVideoDTO> getUserVideoMap(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("startCalcDate")String startCalcDate, @Param("endCalcDate")String endCalcDate);
 | 
	
		
			
				|  |  | +    List<EffiVideoDTO> getUserVideoMap(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("startCalcDate") String startCalcDate, @Param("endCalcDate") String endCalcDate);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    int getEffiVideoCountBySignature(@Param("signature")String signature, @Param("appType")Integer appType);
 | 
	
		
			
				|  |  | +    int getEffiVideoCountBySignature(@Param("signature") String signature, @Param("appType") Integer appType);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      int getEffiVideoCountByUserId(@Param("appType") int appType, @Param("year") int year, @Param("quarter") int quarter, @Param("userId") String userId, @Param("roleId") String roleId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    int getQuarterMaterialCountByUserId(@Param("roleCode")String roleCode, @Param("startTime")String startTime, @Param("endTime")String endTime, @Param("userId")String userId);
 | 
	
		
			
				|  |  | +    int getQuarterMaterialCountByUserId(@Param("roleCode") String roleCode, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("userId") String userId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    BigDecimal getTotalCostByClipId(@Param("userId")String userId, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    BigDecimal getTotalCostByClipId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    BigDecimal getTotalCostByShotId(@Param("userId")String userId, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    BigDecimal getTotalCostByShotId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    BigDecimal getTotalCostByPlanId(@Param("userId")String userId, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    BigDecimal getTotalCostByPlanId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    BigDecimal getTotalCostByPlaneId(@Param("userId")String userId, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    BigDecimal getTotalCostByPlaneId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    BigDecimal getProjectTotalCostByUserId(@Param("userId")String userId, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    BigDecimal getProjectTotalCostByUserId(@Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    List<ProjectDTO> getProjectsByUserId(@Param("userId")String userId);
 | 
	
		
			
				|  |  | +    List<ProjectDTO> getProjectsByUserId(@Param("userId") String userId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    int getPlaneCountByProjectId(@Param("projectId")Long projectId);
 | 
	
		
			
				|  |  | +    int getPlaneCountByProjectId(@Param("projectId") Long projectId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    int getPlaneCountByUserId(@Param("userId")String userId);
 | 
	
		
			
				|  |  | +    int getPlaneCountByUserId(@Param("userId") String userId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    List<DesignMaterialInfo> designMaterialInfoList(@Param("roleCode")String roleCode, @Param("userId")String userId, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    List<DesignMaterialInfo> designMaterialInfoList(@Param("roleCode") String roleCode, @Param("userId") String userId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    List<DesignMaterialInfo> getMaterialAccountInfoByMaterialId(@Param("materialId")String materialId, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    List<DesignMaterialInfo> getMaterialAccountInfoByMaterialId(@Param("materialId") String materialId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    List<ProjectDTO> getProjects(@Param("mediaId")String mediaId);
 | 
	
		
			
				|  |  | +    List<ProjectDTO> getProjects(@Param("mediaId") String mediaId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    BigDecimal getProjectQuarterCostById(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("projectId")Long projectId);
 | 
	
		
			
				|  |  | +    BigDecimal getProjectQuarterCostById(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("projectId") Long projectId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    List<UserDto2> getPlaneByProjectId(@Param("projectId")Long projectId);
 | 
	
		
			
				|  |  | +    List<UserDto2> getPlaneByProjectId(@Param("projectId") Long projectId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      List<UserDto2> getKuaishouDesignLeaderList();
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -68,7 +68,7 @@ public interface UserEfficientVideoMapMapper extends BaseMapper<UserEfficientVid
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      List<UserDto2> getToutiaoDesignLeaderList();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    List<String> getClip(@Param("depId")String depId);
 | 
	
		
			
				|  |  | +    List<String> getClip(@Param("depId") String depId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      BigDecimal getClipQuarterCost(@Param("appType") int appType, @Param("quarter") int quarter, @Param("year") int year, @Param("userId") String userId);
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -108,28 +108,42 @@ public interface UserEfficientVideoMapMapper extends BaseMapper<UserEfficientVid
 | 
	
		
			
				|  |  |      void updateToutiaoEffiType(@Param("toutiaoEffiType") Integer toutiaoEffiType, @Param("signature") String signature);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      List<UserDto2> getKuaishouDepartUserInfo();
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      List<UserDto2> getKuaishouDepartAllUserInfo();
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      List<UserDto2> getToutiaoDepartUserInfo();
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      List<UserDto2> getToutiaoDepartAllUserInfo();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      //根据天数的区间获取userId获取有效视频数量
 | 
	
		
			
				|  |  |      Integer getEffiVideoCountByCalcDate(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("roleId") String roleId, @Param("userId") String userId, @Param("appType") Integer appType);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    List<MaterialInfo> getEffiVideoList(@Param("appType")Integer appType, @Param("year")Integer year, @Param("quarter")Integer quarter, @Param("userId")String userId);
 | 
	
		
			
				|  |  | +    List<MaterialInfo> getEffiVideoList(@Param("appType") Integer appType, @Param("year") Integer year, @Param("quarter") Integer quarter, @Param("userId") String userId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      List<UserDto2> getKuaishouYunyingDepartUserInfo();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      List<UserDto2> getToutiaoYunyingDepartUserInfo();
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      //获取快手单个优化师当前账户下的总消耗
 | 
	
		
			
				|  |  | -    BigDecimal getKuaishouYunyingTotalCost(@Param("userId")String userId, @Param("appType")Integer appType, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    BigDecimal getKuaishouYunyingTotalCost(@Param("userId") String userId, @Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      //获取快手单个优化师当前账户下的总消耗
 | 
	
		
			
				|  |  | -    BigDecimal getToutiaoYunyingTotalCost(@Param("userId")String userId, @Param("appType")Integer appType, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    BigDecimal getToutiaoYunyingTotalCost(@Param("userId") String userId, @Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      //获取快手单个优化师其下所有的账户下当前的消耗
 | 
	
		
			
				|  |  | -    List<AccountDTO> getKuaishouAccountTotalCost(@Param("userId")String userId, @Param("appType")Integer appType, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    List<AccountDTO> getKuaishouAccountTotalCost(@Param("userId") String userId, @Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      //获取头条单个优化师其下所有的账户下当前的消耗
 | 
	
		
			
				|  |  | -    List<AccountDTO> getToutiaoAccountTotalCost(@Param("userId")String userId, @Param("appType")Integer appType, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +    List<AccountDTO> getToutiaoAccountTotalCost(@Param("userId") String userId, @Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    List<MaterialInfo> getEffiWeekVideoList(@Param("appType")Integer appType, @Param("startDate")String startDate, @Param("endDate")String endDate, @Param("userId")String userId);
 | 
	
		
			
				|  |  | +    List<MaterialInfo> getEffiWeekVideoList(@Param("appType") Integer appType, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("userId") String userId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -}
 | 
	
		
			
				|  |  | +    List<String> getWeekCostMd5(@Param("startDate") String startDate, @Param("endDate") String endDate);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    Integer BeforeWeekCostCount(@Param("md5") String md5, @Param("date") String date);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +    String getVideoEarlistCostDate(@Param("md5")String md5);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    BigDecimal videoTotalCostInDates(@Param("md5")String md5, @Param("startDate")String startDate, @Param("endDate")String endDate);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +}
 |