Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -121,6 +121,8 @@
             u.parent_id parentId,
             u.person_status personStatus,
             (select biz_org_name from cb_org_usr where sequence_nbr = u.parent_id) as companyName,
+            (SELECT IFNULL(SUM(IF(aqr.SOURCE = 'patrol', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = u.sequence_nbr  ) as 'patrol',
+            (SELECT IFNULL(SUM(IF(aqr.SOURCE != 'patrol', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = u.sequence_nbr  ) as 'other',
             g.*
             FROM
             cb_org_usr u

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -2602,12 +2602,11 @@
             wes.name as equipmentName,
             wed.equipment_name systemType,
             wes.equip_status AS equipStatus,
-            IFNULL(IFNULL(SUM(IF(aqr.source='equip',1,0)),0),0) as 'equip',
-            IFNULL(count(aqr.sequence_nbr) - IFNULL(SUM(IF(aqr.source='equip',1,0)),0),0) as 'other'
+            (SELECT IFNULL(SUM(IF(aqr.SOURCE = 'equip', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = wes.id  ) as 'equip',
+            (SELECT IFNULL(SUM(IF(aqr.SOURCE != 'equip', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = wes.id  ) as 'other'
         FROM
             wl_equipment_specific wes
         LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
-        LEFT JOIN dl_amos_idx_biz.idx_access_qrcode_record  aqr on aqr.buss_id = wes.id
         <where>
             <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
                 AND  wes.biz_org_code LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')