yumeng 1 yıl önce
ebeveyn
işleme
d3d3cb97f2

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentRechargeApplicationMapper.xml

@@ -14,7 +14,7 @@
                  UNION ALL
                  SELECT t1.audit_status,
                         IFNULL(t1.revieweder_id, '-'),
-                        IFNULL(t1.revieweder, '-'),
+                        IFNULL(t1.revieweder, '-'),application
                         CASE
                             WHEN revieweder_id like'financ%' THEN '财务审核'
                             WHEN revieweder_id ='meidaManager' THEN '媒介'

+ 6 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceVideoReportCtrl.java

@@ -78,7 +78,7 @@ public class BytedanceVideoReportCtrl {
     }
 
     @PostMapping("/exportBytedanceSevenDayCost")
-    public void exportBytedanceSevenDayCost(HttpServletRequest request, HttpServletResponse response,@RequestBody JSONObject requestBody) {
+    public void exportBytedanceSevenDayCost(HttpServletRequest request, HttpServletResponse response, @RequestBody JSONObject requestBody) {
 
         if (requestBody.isEmpty()) {
             log.error("request body is empty");
@@ -111,10 +111,14 @@ public class BytedanceVideoReportCtrl {
                         export.add(date.getString("first_cost_time"));
                         export.add(date.getString("diff_day"));
                         export.add(date.getString("seven_day_cost"));
+                        export.add(date.getString("leader_name"));
+                        export.add(date.getString("clip_name"));
+                        export.add(date.getString("shot_name"));
+                        export.add(date.getString("plan_name"));
                         exportList.add(export);
                     }
                 }
-                String[] headers = {"项目名称", "素材ID", "素材名称", "首次消耗日期", "消耗天数", "消耗"};
+                String[] headers = {"项目名称", "素材ID", "素材名称", "首次消耗日期", "消耗天数", "消耗", "负责人", "剪辑", "拍摄", "编导"};
                 OutputStream os = response.getOutputStream();
                 ExportExcelUtils eeu = new ExportExcelUtils();
                 XSSFWorkbook workbook = new XSSFWorkbook();

+ 18 - 12
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceVideoReportMapper.xml

@@ -77,25 +77,31 @@
         order by t1.stat_datetime desc
     </select>
     <select id="getBytedanceSevenDayCost" resultType="com.alibaba.fastjson.JSONObject">
-        select project_name,
-        cast(material_id as char) as 'material_id',
-        material_name,
-        date_format(first_cost_time, '%Y-%m-%d') as 'first_cost_time',
-        (diff_day + 1) as diff_day,
-        seven_day_cost
-        from application.bytedance_material_seven_day_cost
+        select t1.project_name,
+        cast(t1.material_id as char) as 'material_id',
+        t1.material_name,
+        date_format(t1.first_cost_time, '%Y-%m-%d') as 'first_cost_time',
+        (t1.diff_day + 1) as diff_day,
+        t1.seven_day_cost as seven_day_cost,
+        t2.leader_name as leader_name,
+        t2.clip_name as clip_name,
+        t2.shot_name as shot_name,
+        t2.plan_name as plan_name
+        from application.bytedance_material_seven_day_cost t1
+        left join `application`.app_bytedance_material_info t2
+        on t1.md5 = t2.material_id
         where 1 = 1
         <if test="projectId != null ">
-            and project_id = #{projectId}
+            and t1.project_id = #{projectId}
         </if>
         <if test="startDate != null ">
-            and first_cost_time &gt;= #{startDate}
+            and t1.first_cost_time &gt;= #{startDate}
         </if>
         <if test="endDate != null ">
-            and first_cost_time &lt;= #{endDate}
+            and t1.first_cost_time &lt;= #{endDate}
         </if>
-        and media_id = 1
-        order by seven_day_cost desc
+        and t1.media_id = 1
+        order by t1.seven_day_cost desc
 
     </select>
 </mapper>