|
@@ -1071,8 +1071,8 @@
|
|
count(t.project_id) as sumProjectQty,
|
|
count(t.project_id) as sumProjectQty,
|
|
sum(t.deviceTotal) as sumProjectEquipmentQty,
|
|
sum(t.deviceTotal) as sumProjectEquipmentQty,
|
|
FORMAT(sum(t.priceTotal),2) AS sumProjectPrice,
|
|
FORMAT(sum(t.priceTotal),2) AS sumProjectPrice,
|
|
- (count(t.progress = '100%' or null) / count(t.project_id) * 100) as completionRate,
|
|
|
|
- (count(t.progress like '0% ' or null) / count(t.project_id) * 100) as lostOrderRate
|
|
|
|
|
|
+ ROUND(count(t.progress = '100%' or null) / count(t.project_id) * 100, 2) as completionRate,
|
|
|
|
+ ROUND(count(t.progress like '0% ' or null) / count(t.project_id) * 100, 2) as lostOrderRate
|
|
from (
|
|
from (
|
|
select p.*,
|
|
select p.*,
|
|
ta.account_name as account_name,
|
|
ta.account_name as account_name,
|
|
@@ -1181,7 +1181,7 @@
|
|
on permission.premession_char = p.permission_char
|
|
on permission.premession_char = p.permission_char
|
|
<where>
|
|
<where>
|
|
DATE_FORMAT(p.create_time, '%Y') = #{yearParam}
|
|
DATE_FORMAT(p.create_time, '%Y') = #{yearParam}
|
|
- and p.del_flag = '0'
|
|
|
|
|
|
+ and p.del_flag = '0' and p.status = '03'
|
|
<if test="accountName != null and accountName != ''">and ta.account_name like concat('%',#{accountName},'%') escape '/'</if>
|
|
<if test="accountName != null and accountName != ''">and ta.account_name like concat('%',#{accountName},'%') escape '/'</if>
|
|
<if test="areaId != null and areaId.size() > 0">
|
|
<if test="areaId != null and areaId.size() > 0">
|
|
and p.area_id in
|
|
and p.area_id in
|