yumeng 2 лет назад
Родитель
Сommit
5a3fde48d4

+ 8 - 8
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialReportOverViewV3Mapper.xml

@@ -628,9 +628,9 @@
     <select id="queryKuaishouTopDesign" resultType="com.alibaba.fastjson.JSONObject">
         select t1.* from (
         select sum(charge) as 'cost',
-        <if test="type == 1">shot_name as userName, "摄像" as roleName</if>
-        <if test="type == 2">clip_name as userName, "剪辑" as roleName</if>
-        <if test="type == 3">plan_name as userName, "编导" as roleName</if>
+        <if test="type == 1">shot_name as userName, "摄像" as roleName,shot_id as 'userId'</if>
+        <if test="type == 2">clip_name as userName, "剪辑" as roleName,clip_id as 'userId'</if>
+        <if test="type == 3">plan_name as userName, "编导" as roleName,plan_id as 'userId'</if>
         from application.kuaishou_material_video_report_daily_dw
         where 1 = 1
         and stat_date >= #{startDate}
@@ -648,7 +648,7 @@
             and plan_id is not null
             group by plan_id
         </if>
-        ) t1 left join `jeecg-boot`.sys_user t2 on t1.shot_id = t2.id
+        ) t1 left join `jeecg-boot`.sys_user t2 on t1.userId = t2.id
         where t2.status = 1
         order by t1.cost desc
     </select>
@@ -656,9 +656,9 @@
     <select id="queryBytedanceTopDesign" resultType="com.alibaba.fastjson.JSONObject">
         select t1.* from (
         select sum(cost) as 'cost',
-        <if test="type == 1">shot_name as userName, "摄像" as roleName</if>
-        <if test="type == 2">clip_name as userName, "剪辑" as roleName</if>
-        <if test="type == 3">plan_name as userName, "编导" as roleName</if>
+        <if test="type == 1">shot_name as userName, "摄像" as roleName,shot_id as 'userId'</if>
+        <if test="type == 2">clip_name as userName, "剪辑" as roleName,clip_id as 'userId'</if>
+        <if test="type == 3">plan_name as userName, "编导" as roleName,plan_id as 'userId'</if>
         from application.bytedance_material_video_report_daily_dw
         where 1 = 1
         and stat_datetime >= #{startDate}
@@ -676,7 +676,7 @@
             and plan_id is not null
             group by plan_id
         </if>
-        ) t1 left join `jeecg-boot`.sys_user t2 on t1.shot_id = t2.id
+        ) t1 left join `jeecg-boot`.sys_user t2 on t1.userId = t2.id
         where t2.status = 1
         order by t1.cost desc
     </select>