|
@@ -493,7 +493,7 @@
|
|
|
t1.project_id as 'projectId',
|
|
|
t1.project_name as 'projectName',
|
|
|
t4.realname AS 'saleName',
|
|
|
- t5.realname AS 'operateName',
|
|
|
+ t5.responsible_name AS 'operateName',
|
|
|
SUM( t1.charge ) AS 'charge',
|
|
|
CONCAT( CAST( IFNULL( ROUND(( SUM( t1.charge ) - t3.charge ) / t3.charge * 100, 2 ), 0.00 ) AS CHAR ), '%' ) AS
|
|
|
'chargeRoi',
|
|
@@ -534,7 +534,7 @@
|
|
|
AND stat_date <= DATE_FORMAT(DATE_ADD(#{endTime}, INTERVAL - ${days} DAY ), '%Y%m%d' )
|
|
|
GROUP BY project_id ) t3 ON t1.project_id = t3.project_id
|
|
|
left join(select id,realname from `jeecg-boot`.sys_user )t4 on t1.sale_id=t4.id
|
|
|
- left join(select id,realname from `jeecg-boot`.sys_user )t5 on t1.user_id=t5.id
|
|
|
+ left join(SELECT id,responsible_name FROM `jeecg-boot`.ctop_project )t5 on t1.project_id = t5.id
|
|
|
WHERE hour <= #{hour}
|
|
|
and company_id = #{companyId}
|
|
|
<if test="accountIds !=null and accountIds.size()>0">
|
|
@@ -555,7 +555,7 @@
|
|
|
t1.project_id as 'projectId',
|
|
|
t1.project_name as 'projectName',
|
|
|
t4.realname AS 'saleName',
|
|
|
- t5.realname AS 'operateName',
|
|
|
+ t5.responsible_name AS 'operateName',
|
|
|
SUM( t1.cost ) AS 'charge',
|
|
|
CONCAT( CAST( IFNULL( ROUND(( SUM( t1.cost ) - t3.charge ) / t3.charge * 100, 2 ), 0 ) AS CHAR ), '%' ) AS
|
|
|
'chargeRoi',
|
|
@@ -596,7 +596,7 @@
|
|
|
AND hour <= #{hour}
|
|
|
GROUP BY project_id ) t3 ON t1.project_id = t3.project_id
|
|
|
left join(select id,realname from `jeecg-boot`.sys_user )t4 on t1.sale_id=t4.id
|
|
|
- left join(select id,realname from `jeecg-boot`.sys_user )t5 on t1.user_id=t5.id
|
|
|
+ left join(SELECT id,responsible_name FROM `jeecg-boot`.ctop_project )t5 on t1.project_id = t5.id
|
|
|
WHERE t1.stat_datetime >= DATE_FORMAT(#{startTime}, '%Y%m%d' )
|
|
|
AND t1.stat_datetime <= DATE_FORMAT(#{endTime}, '%Y%m%d' )
|
|
|
and company_id = #{companyId}
|