|
@@ -1878,6 +1878,7 @@
|
|
t0.realname AS 'userName',
|
|
t0.realname AS 'userName',
|
|
CONCAT(IFNULL(ROUND(((SUM( t1.cost )-t3.totalCost) / t3.totalCost) * 100,2),0),'%') AS 'yearOnYear',
|
|
CONCAT(IFNULL(ROUND(((SUM( t1.cost )-t3.totalCost) / t3.totalCost) * 100,2),0),'%') AS 'yearOnYear',
|
|
CONCAT(IFNULL(ROUND(((SUM( t1.cost )-t5.totalCost) / t5.totalCost) * 100,2),0),'%') AS 'equallyRate',
|
|
CONCAT(IFNULL(ROUND(((SUM( t1.cost )-t5.totalCost) / t5.totalCost) * 100,2),0),'%') AS 'equallyRate',
|
|
|
|
+ t6.adspNum,
|
|
t4.*
|
|
t4.*
|
|
FROM
|
|
FROM
|
|
${tableName} t1
|
|
${tableName} t1
|
|
@@ -1973,6 +1974,29 @@
|
|
</if>
|
|
</if>
|
|
GROUP BY project_id
|
|
GROUP BY project_id
|
|
) t5 ON t1.project_id = t5.project_id
|
|
) t5 ON t1.project_id = t5.project_id
|
|
|
|
+ LEFT JOIN (
|
|
|
|
+ SELECT
|
|
|
|
+ project_id,
|
|
|
|
+ IFNULL( SUM( material_num ), 0 ) 'adspNum'
|
|
|
|
+ FROM
|
|
|
|
+ application.new_material_num_in_project
|
|
|
|
+ <where>
|
|
|
|
+ <if test="startDate != null and startDate != '' ">
|
|
|
|
+ and stat_date >= #{startDate}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="endDate != null and endDate != '' ">
|
|
|
|
+ and stat_date <= #{endDate}
|
|
|
|
+ </if>
|
|
|
|
+ <if test='projectIds!=null and projectIds.size()>0'>
|
|
|
|
+ AND project_id IN
|
|
|
|
+ <foreach collection="projectIds" item="item" separator=","
|
|
|
|
+ open="(" close=")">
|
|
|
|
+ #{item}
|
|
|
|
+ </foreach>
|
|
|
|
+ </if>
|
|
|
|
+ </where>
|
|
|
|
+ GROUP BY project_id
|
|
|
|
+ )t6 ON t1.project_id = t6.project_id
|
|
WHERE t1.cost > 0
|
|
WHERE t1.cost > 0
|
|
<if test="startDate != null and startDate != '' ">
|
|
<if test="startDate != null and startDate != '' ">
|
|
and t1.stat_datetime >= #{startDate}
|
|
and t1.stat_datetime >= #{startDate}
|