Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/resources/mapper/device/EquOperationRecordMapper.xml

@@ -175,7 +175,7 @@
             SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END) AS operationEquipment,
             SUM(CASE WHEN equipment_status = '0' or equipment_status = '0' THEN 1 Else 0 END) AS faultEquipment,
             COUNT(*) AS totalEquipment,
-            CONCAT(cast(SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END)*100/COUNT(*)as decimal(10,2)),'%') AS intactRate
+		    CAST(SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END)*100.00/COUNT(*) as decimal(18,2)) AS intactRate
         FROM base_equipment
         WHERE  del_flag = '0' AND status = '1'
     </select>