Browse Source

Merge branch 'test' of https://gitee.com/hcst/adsp-boot into test

xuzuoyun 5 years ago
parent
commit
9befa5349b

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -124,7 +124,9 @@ public class ProjectController {
                     for (ProjectMember member : projectMemberList) {
                         Long projectId = member.getProjectId();
                         Project project = projectService.getById(projectId);
-                        projects.add(project);
+                        if (null != project) {
+                            projects.add(project);
+                        }
                     }
                 }
             } else {

+ 2 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/BytedancePlanHourlyReportLoadJob.java

@@ -1,10 +1,8 @@
 package org.jeecg.modules.ctop.job;
 
-import cn.com.ctop.bytedance.service.IBytedancePlanHourlyReportService;
 import cn.com.ctop.bytedance.service.IReportService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -28,10 +26,6 @@ public class BytedancePlanHourlyReportLoadJob implements Job {
     @Autowired
     private ICtopOauthTokenService tokenService;
     @Autowired
-    private IBytedancePlanHourlyReportService planHourlyReportService;
-    @Autowired
-    private IUserAllocationService userAllocationService;
-    @Autowired
     private IReportService reportService;
     static ExecutorService executorService = null;
     //线程计数器
@@ -70,6 +64,8 @@ public class BytedancePlanHourlyReportLoadJob implements Job {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
+        //清洗玫瑰相亲渠道号数据
+
         log.info("头条计划时报数据获取完成");
         executorService.shutdown();
     }

+ 2 - 2
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml

@@ -482,7 +482,7 @@
         left join ctop_bytedance_creative b on a.creative_id = b.id
         left join ctop_bytedance_video_info c on b.video_id = c.id
         left join ctop_material_info d on c.signature = d.code
-        left join ctop_material_ascription e on on d.id = e.material_id
+        left join ctop_material_ascription e on d.id = e.material_id
         left join sys_user f1 on e.clip_id = f1.id
         left join sys_user f2 on e.shot_id = f2.id
         left join sys_user f3 on e.plan_id = f3.id
@@ -494,7 +494,7 @@
         date_format(d.create_time, '%Y-%m-%d') >= #{startDate} and
         date_format(d.update_time, '%Y-%m-%d') <= #{endDate}
         group by c.signature
-        having sum(a.charge) >= 5000
+        having sum(a.cost) >= 5000
     </select>
 
     <!-- 头条根据plan_id获取视频总消耗 -->