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

@@ -198,7 +198,7 @@
             u.sequence_nbr ,
             u.biz_org_name ,
             u.biz_org_code
-            order by u.rec_date desc
+            order by  CONVERT(u.biz_org_name USING gbk) ASC, u.person_status DESC, u.rec_date desc
             )a where a.sequenceNbr is not null
             <if test="map.fieldsValue != null">
                 <foreach collection="map.fieldsValue.keys" item="item">

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -294,6 +294,10 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     IPage<EquipTypeImgAmountVO> getMonitoringUnitList(@Param("page") IPage page,@Param("equipTypeAmountPage") EquipTypeAmountPageDTO equipTypeAmountPage);
 
     List<Map<String, Object >> getMonitoringCount(String bizOrgCode);
-
+    
     String getEquipIdByCheckInputId(@Param(value = "id")  String id);
+    
+    Map<String, Object> getMonitoringEquip(String id);
+
+    Map<String, Object> getMonitoringOther(String id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2149,6 +2149,11 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
     @Override
     public IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage) {
+        IPage<EquipTypeImgAmountVO> record = equipmentSpecificMapper.getMonitoringUnitList(equipTypeAmountPage.getPage(),equipTypeAmountPage);
+        record.getRecords().forEach(e-> {
+            e.setEquip(equipmentSpecificMapper.getMonitoringEquip(String.valueOf(e.getId())).get("num").toString());
+            e.setOther(equipmentSpecificMapper.getMonitoringOther(String.valueOf(e.getId())).get("num").toString());
+        });
         return equipmentSpecificMapper.getMonitoringUnitList(equipTypeAmountPage.getPage(),equipTypeAmountPage);
     }
 

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

@@ -2612,9 +2612,7 @@
             wes.biz_org_name as bizOrgName,
             wes.name as equipmentName,
             wed.equipment_name systemType,
-            wes.equip_status AS equipStatus,
-            (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'
+            wes.equip_status AS equipStatus
         FROM
             wl_equipment_specific wes
         LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
@@ -2646,4 +2644,11 @@
                 GROUP BY code
     </select>
 
+    <select id="getMonitoringEquip" resultType="java.util.Map">
+       SELECT IFNULL(SUM(IF(aqr.SOURCE = 'equip', 1, 0)), 0) as num FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = #{id}
+    </select>
+    <select id="getMonitoringOther" resultType="java.util.Map">
+        SELECT IFNULL(SUM(IF(aqr.SOURCE != 'equip', 1, 0)), 0) as num FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = #{id}
+    </select>
+
 </mapper>
\ No newline at end of file