代码提交

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

@@ -111,7 +111,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             EquipmentSpecificIndex equipmentSpeIndex = equipmentSpecificIndexMapper.selectOne(queryWrapper);
             equipAlarm.setKey(indexKey);
             equipAlarm.setValue(equipmentSpeIndex.getValue());
-            equipAlarm.setAlarmContent(equipmentSpeIndex.getEquipmentName() + equipmentSpeIndex.getEquipmentIndexName());
+            equipAlarm.setAlarmContent(equipmentSpeIndex.getEquipmentSpecificName() + equipmentSpeIndex.getEquipmentIndexName());
             equipAlarm.setAlarmDate(equipmentSpeIndex.getUpdateDate());
 
 

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

@@ -5909,8 +5909,9 @@
             from
             cb_water_resource
             <where>
+                resource_type = 'industryPool' or resource_type = 'pool'
                 <if test="bizOrgCode != null and bizOrgCode != ''">
-                    biz_org_code like concat(#{bizOrgCode}, '%')
+                   AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
             </where>
             ) AS total,
@@ -5920,6 +5921,7 @@
             cb_water_resource
             <where>
                 water_status = '2'
+                AND resource_type = 'industryPool' or resource_type = 'pool'
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -5931,6 +5933,7 @@
             cb_water_resource
             <where>
                 water_status = '1'
+                AND resource_type = 'industryPool' or resource_type = 'pool'
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>