diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 11a0a5d..84b87fa 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -120,16 +120,15 @@ corp_info c LEFT JOIN ( SELECT - COUNT( u.id ) user_count, - u.corpinfo_id + COUNT( r.id ) user_count, + r.corp_id FROM - `user` u + dahua_access_record r WHERE - u.delete_enum = 'FALSE' - AND u.main_corp_flag = 0 + r.open_type = 3 GROUP BY - u.corpinfo_id - ) utmp ON c.id = utmp.corpinfo_id + r.corp_id + ) utmp ON c.id = utmp.corp_id LEFT JOIN ( SELECT u.corpinfo_id, @@ -148,16 +147,15 @@ ) prtmp ON c.id = prtmp.corpinfo_id LEFT JOIN ( SELECT - va.vehicle_corp_id, - COUNT(va.id) pub_car_count + r.corp_id, + COUNT(r.id) pub_car_count FROM - `vehicle_apply` va WHERE va.delete_enum = 'FALSE' - - and va.vehicle_belong_type in (2,4) - and va.vehicle_belong_type = 8 - + dahua_vehicle_access_record r + WHERE + r.exit_time IS NOT NULL GROUP BY - va.vehicle_corp_id) pubtmp on pubtmp.vehicle_corp_id = c.id + r.corp_id + ) pubtmp ON c.id = pubtmp.corp_id WHERE c.delete_enum = 'FALSE' @@ -235,5 +233,4 @@ ORDER BY id DESC - - + \ No newline at end of file