Browse Source

xuanpin库

zhaoxian 3 years ago
parent
commit
1a50a40ead

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/material/mapper/xml/ProductMaterialMapper.xml

@@ -69,7 +69,7 @@
         t1.trade_type as 'tradeType',
         t1.item_run as 'itemRun',
         IFNULL(sum(t2.charge),0.00) as 'charge',
-        CONCAT(t1.start_month,' ~ ',t1.end_month) as 'time',
+        CONCAT_WS(' ~ ',t1.start_month,t1.end_month) AS 'time',
         IFNULL(t3.realname,'-') as 'user',
         IFNULL(t4.videoCount ,'-') as 'videoCount'
         FROM ctop_product_material t1
@@ -89,7 +89,7 @@
         </where>
         GROUP BY signature
         ) t2 ON t1.signature = t2.signature
-        LEFT JOIN (select id, realname from sys_user) t3 on t1.user_id =t3.id
+        LEFT JOIN (select id, realname from sys_user) t3 on t1.uploader_id =t3.id
         LEFT JOIN ( SELECT product_id, trade_name, sum(1)AS 'videoCount' FROM ctop_product_material
         WHERE video_url is not null
         GROUP BY product_id,trade_name) t4 ON t1.product_id = t4.product_id AND t1.trade_name= t4.trade_name
@@ -143,7 +143,7 @@
               AND stat_date &lt;= DATE_FORMAT(#{endDate}, '%Y%m%d')
             GROUP BY signature
         ) t2 ON t1.signature = t2.signature
-                 LEFT JOIN (select id, realname from sys_user) t3 on t1.user_id = t3.id
+                 LEFT JOIN (select id, realname from sys_user) t3 on t1.uploader_id = t3.id
         WHERE video_url is not null
         and product_id = #{productId}
           and trade_name = #{tradeName}
@@ -180,7 +180,7 @@
         </where>
         GROUP BY signature
         ) t2 ON t1.signature = t2.signature AND t1.product_id=t2.product_id
-        LEFT JOIN (select id, realname from sys_user) t3 on t1.user_id =t3.id
+        LEFT JOIN (select id, realname from sys_user) t3 on t1.uploader_id =t3.id
         where video_url is not null
         <if test="productId!=null">
             and t1.product_id = #{productId}