Ver código fonte

Merge branch 'video-dev' into test

hcst_sunzhen 5 anos atrás
pai
commit
993623eac7

+ 4 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -331,8 +331,10 @@ public class ProjectMemberController {
     @GetMapping(value = "/bytedanceProjectParticipateInList")
     public  Result<List<ProjectMember>> bytedanceProjectParticipateInList() {
         Result<List<ProjectMember>> result = new Result<>();
-        Integer mediaId = 1;
-        List<ProjectMember> projectMemberList = projectMemberService.getProjects(mediaId);
+        List<Integer> mediaIds = new ArrayList<>();
+        mediaIds.add(1);
+        mediaIds.add(3);
+        List<ProjectMember> projectMemberList = projectMemberService.getProjects(mediaIds);
         if (projectMemberList == null) {
             result.error500("未找到对应实体");
         } else {

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ProjectMemberMapper.java

@@ -17,13 +17,13 @@ public interface ProjectMemberMapper extends BaseMapper<ProjectMember> {
 
     List<Long> selectProjectsByUserId(@Param("userId") String userId);
 
-    List<ProjectMember> adminProjects(@Param("mediaId")Integer mediaId);
+    List<ProjectMember> adminProjects(@Param("mediaIds")List<Integer> mediaIds);
 
-    List<ProjectMember> designLeaderProjects(@Param("companyId")String companyId ,@Param("mediaId")Integer mediaId);
+    List<ProjectMember> designLeaderProjects(@Param("companyId")String companyId ,@Param("mediaIds")List<Integer> mediaIds);
 
-    List<ProjectMember> designProjects(@Param("userId")String userId, @Param("mediaId")Integer mediaId);
+    List<ProjectMember> designProjects(@Param("userId")String userId, @Param("mediaIds")List<Integer> mediaIds);
 
-    List<ProjectMember> operationProjects(@Param("userId")String userId, @Param("mediaId")Integer mediaId);
+    List<ProjectMember> operationProjects(@Param("userId")String userId, @Param("mediaIds")List<Integer> mediaIds);
 
     String getRoleCodeByUserId(@Param("userId")String userId);
 

+ 43 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMemberMapper.xml

@@ -12,54 +12,80 @@
     <!-- 设计师展示所有自己的角色下制作的视频 -->
     <select id="adminProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-        id,
-        project_name,
-        advertiser_id,
-        advertiser_name,
-        media_id,
-        max_bid,
-        advertiser_name,
-        responsible_name
+        id as projectId,
+        project_name as projectName,
+        advertiser_id as advertiserId,
+        advertiser_name as advertiserName,
+        media_id as mediaId,
+        max_bid as maxBid,
+        advertiser_name as advertiserName ,
+        responsible_name as responsibleName
         from
         ctop_project
         where
-        media_id = #{mediaId}
+        media_id in
+        <foreach collection="mediaIds" item="item" separator=","
+                 open="(" close=")">
+            #{item}
+        </foreach>
     </select>
 
     <!-- 视频报表设计师leader展示自己所在公司的所有项目 -->
     <select id="designLeaderProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-            distinct b.id, b.project_name,b.advertiser_id,b.advertiser_name
+            distinct b.id as projectId,
+            b.project_name as projectName,
+            b.advertiser_id as advertiserId,
+            b.advertiser_name as advertiserName,
+            b.media_id as mediaId
         from
         ctop_project_member a
         left join ctop_project b on a.project_id = b.id
         where
         b.company_id = #{companyId}
-        and b.media_id = #{mediaId}
+        and b.media_id in
+        <foreach collection="mediaIds" item="item" separator=","
+                 open="(" close=")">
+            #{item}
+        </foreach>
     </select>
 
     <!-- 设计师展示所有自己的角色下制作的视频 -->
     <select id="designProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-            distinct a.project_id,b.project_name,b.advertiser_id,b.advertiser_name
+            distinct a.project_id as projectId,
+            b.project_name as projectName,
+            b.advertiser_id as advertiserId,
+            b.advertiser_name as advertiserName,
+            b.media_id as mediaId
         from
         ctop_project_member a
         left join ctop_project b on a.project_id = b.id
         where a.user_id = #{userId}
-        and b.media_id = #{mediaId}
-       -- group by a.project_id
+        and b.media_id in
+        <foreach collection="mediaIds" item="item" separator=","
+                 open="(" close=")">
+            #{item}
+        </foreach>
     </select>
 
     <!-- 运营和运营负责人展示所在项目视频 -->
     <select id="operationProjects" resultType="org.jeecg.modules.ctop.entity.ProjectMember">
         select
-           distinct b.id,b.project_name,b.advertiser_id,b.advertiser_name
+           distinct b.id as projectId,
+           b.project_name as projectName,
+           b.advertiser_id as advertiserId,
+           b.advertiser_name as advertiserName,
+           b.media_id as mediaId
         from
         ctop_user_allocation a
         left join ctop_project b on a.project_id = b.id
         where a.user_id = #{userId}
-        and b.media_id = #{mediaId}
-       -- group by a.project_id
+        and b.media_id in
+        <foreach collection="mediaIds" item="item" separator=","
+                 open="(" close=")">
+            #{item}
+        </foreach>
     </select>
 
     <select id="getRoleCodeByUserId" resultType="string">

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectMemberService.java

@@ -20,5 +20,5 @@ public interface IProjectMemberService extends IService<ProjectMember> {
 
     List<Long> selectProjectsByUserId(String userId);
 
-    List<ProjectMember> getProjects(Integer mediaId);
+    List<ProjectMember> getProjects(List<Integer> mediaIds);
 }

+ 9 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -13,6 +13,7 @@ import org.jeecg.modules.system.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,22 +63,25 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
     }
 
     //视频报表
-    public List<ProjectMember> getProjects(Integer mediaId){
+    public List<ProjectMember> getProjects(List<Integer> mediaIds){
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getId();
         String roleCode = memberMapper.getRoleCodeByUserId(userId);
         String companyId = memberMapper.getCompanyIdByUserId(userId);
 
+        //List<Integer> mediaIds = new ArrayList<>();
+        //mediaIds.add(1);
+        //mediaIds.add(3);
         //角色权限判断
         List<ProjectMember> projectMemberList = null;
         if(roleCode.equals("plan") || roleCode.equals("clip") || roleCode.equals("shot") || roleCode.equals("plane")|| roleCode.equals("planeLeader")){
-            projectMemberList = memberMapper.designProjects(userId, mediaId);
+            projectMemberList = memberMapper.designProjects(userId, mediaIds);
         }else if( roleCode.equals("designTeamLeader")){
-            projectMemberList = memberMapper.designLeaderProjects(companyId, mediaId);
+            projectMemberList = memberMapper.designLeaderProjects(companyId, mediaIds);
         }else if(roleCode.equals("admin")){
-            projectMemberList = memberMapper.adminProjects(mediaId);
+            projectMemberList = memberMapper.adminProjects(mediaIds);
         }else if(roleCode.equals("operator") || roleCode.equals("operationAssistant") || roleCode.equals("touTiaoOperationManager")){
-            projectMemberList = memberMapper.operationProjects(userId, mediaId);
+            projectMemberList = memberMapper.operationProjects(userId, mediaIds);
         }
 
         return projectMemberList;

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/ByteDanceVideoReportDailyController.java

@@ -239,7 +239,7 @@ public class ByteDanceVideoReportDailyController {
 			 for (ByteDanceVideoReportDaily sum : list) {
 				 List<Object> ByteDanceVideoReportDaily = new ArrayList();
 				 ByteDanceVideoReportDaily.add(sum.getAdvertiserName());  //客户
-				 ByteDanceVideoReportDaily.add(sum.getAccountId());  //账户
+				 ByteDanceVideoReportDaily.add(sum.getAccountId()+"");  //账户
 				 ByteDanceVideoReportDaily.add(sum.getVideoUrl() );  //视频链接
 				 ByteDanceVideoReportDaily.add(DateUtils.formatDate(sum.getStatDatetime()));  //时间
 				 ByteDanceVideoReportDaily.add(sum.getCost());  //消耗

+ 14 - 14
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ByteDanceVideoReportDailyServiceImpl.java

@@ -326,20 +326,20 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
         }
 
         //计算环比
-        for(ByteDanceVideoReportDaily m:mList){
-            Integer datediff = DateUtils.dateDiff(startDate, endDate);
-            String startMonthDate = DateUtils.formatDate(DateUtils.addDay(startDate,-(datediff + 1) ) );
-            String endMonthDate = DateUtils.formatDate(DateUtils.addDay(startDate,-1));
-
-            BigDecimal costBefore = byteDanceVideoReportDailyMapper.getVideoReportDailyByDateAndSignature(startMonthDate,endMonthDate,m.getSignature(),accountIdsList);
-
-            BigDecimal huanbi =BigDecimal.ZERO;
-            if(costBefore != null && costBefore.compareTo(BigDecimal.ZERO)>0){
-                huanbi = m.getCost().subtract(costBefore).divide(costBefore,7, BigDecimal.ROUND_HALF_UP);
-            }
-
-            m.setHuanbi(huanbi);
-        }
+        //for(ByteDanceVideoReportDaily m:mList){
+        //    Integer datediff = DateUtils.dateDiff(startDate, endDate);
+        //    String startMonthDate = DateUtils.formatDate(DateUtils.addDay(startDate,-(datediff + 1) ) );
+        //    String endMonthDate = DateUtils.formatDate(DateUtils.addDay(startDate,-1));
+        //
+        //    BigDecimal costBefore = byteDanceVideoReportDailyMapper.getVideoReportDailyByDateAndSignature(startMonthDate,endMonthDate,m.getSignature(),accountIdsList);
+        //
+        //    BigDecimal huanbi =BigDecimal.ZERO;
+        //    if(costBefore != null && costBefore.compareTo(BigDecimal.ZERO)>0){
+        //        huanbi = m.getCost().subtract(costBefore).divide(costBefore,7, BigDecimal.ROUND_HALF_UP);
+        //    }
+        //
+        //    m.setHuanbi(huanbi);
+        //}
         return mList;
     }