Merge branch 'master' of gitlab.cloudcross.net:ssp/ssp_web

src/main/java/com/cloudcross/ssp/model/mapper/report.sql.xml

@@ -1330,14 +1330,14 @@ sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression
 	
 	
 		<select id="findByPlace" parameterType="map" resultType="com.cloudcross.ssp.model.DeliverAnalysis">
-		select t_place.name as place,sum(p.pv) as pv, sum(p.uv) as uv, sum(p.impression) as impression, 
+		select po.name as place,sum(p.pv) as pv, sum(p.uv) as uv, sum(p.impression) as impression, 
 		sum(uimpression) as uImpression,
 		sum(uclick) as uClick,sum(p.click) as click, sum(p.ecpm) as eCpm,
-    sum(p.income) as income, 100 * sum(p.pv) / (select sum(pv) from t_rpt_zone_place where operator_id = #{operatorId} and date &gt;= #{startDate} and date &lt;= #{endDate}) as viewRate, 
+    sum(p.income) as income, 
+    100 * sum(p.pv) / (select sum(pv) from t_rpt_zone_place where operator_id = #{operatorId} and date &gt;= #{startDate} and date &lt;= #{endDate}) as viewRate, 
     100 * sum(p.impression) / sum(p.pv) as fillRate, 100 * sum(p.click) / sum(p.impression) as clickRate
-    from ((select distinct place_id from t_rpt_zone_place where operator_id = #{operatorId} and date &gt;= #{startDate} and date &lt;= #{endDate}) as a ), 
-    t_rpt_zone_place as p, t_place where a.place_id = p.place_id and a.place_id = t_place.id
-    and operator_id = #{operatorId} and date &gt;= #{startDate} and date &lt;= #{endDate}
+    from t_rpt_zone_place as p, t_place_operator po where p.place_id = po.place_id and p.operator_id = po.operator_id 
+    and p.operator_id = #{operatorId} and date &gt;= #{startDate} and date &lt;= #{endDate}
     group by p.place_id
     order by p.impression desc
 	limit #{pager.offset}, #{pager.limit}
@@ -1349,14 +1349,13 @@ sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression
 	</select>
 	
 		<select id="findByPlace1" parameterType="map" resultType="com.cloudcross.ssp.model.DeliverAnalysis">
-		select t_place.name as place,sum(p.pv) as pv, sum(p.uv) as uv, sum(p.impression) as impression, 
+		select po.name as place,sum(p.pv) as pv, sum(p.uv) as uv, sum(p.impression) as impression, 
 		sum(uimpression) as uImpression,
 		sum(uclick) as uClick,sum(p.click) as click, sum(p.ecpm) as eCpm,
     sum(p.income) as income, 100 * sum(p.pv) / (select sum(pv) from t_rpt_zone_place where operator_id = #{operatorId} and date &gt;= #{startDate} and date &lt;= #{endDate}) as viewRate, 
     100 * sum(p.impression) / sum(p.pv) as fillRate, 100 * sum(p.click) / sum(p.impression) as clickRate
-    from ((select distinct place_id from t_rpt_zone_place where operator_id = #{operatorId} and date &gt;= #{startDate} and date &lt;= #{endDate}) as a ), 
-    t_rpt_zone_place as p, t_place where a.place_id = p.place_id and a.place_id = t_place.id
-    and operator_id = #{operatorId} and date &gt;= #{startDate} and date &lt;= #{endDate}
+    from t_rpt_zone_place as p, t_place_operator po where p.place_id = po.place_id and p.operator_id = po.operator_id 
+    and po.operator_id = #{operatorId} and date &gt;= #{startDate} and date &lt;= #{endDate}
     group by p.place_id
      order by p.impression desc
 	</select>