diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index da99850..66d602f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -61,7 +61,6 @@ TO_CHAR(alarmTimeDate,'yyyy-mm-dd') - SELECT - COUNT(*) AS "alarmTimes", - COUNT(DISTINCT wellCode) AS "alarmWells" + COUNT(ar.ID) AS "alarmTimes", + COUNT(DISTINCT ar.WELL_CODE) AS "alarmWells" FROM - alarm_now_view + alarm_records ar + JOIN bus_well_info bwi ON bwi.WELL_CODE = ar.WELL_CODE WHERE - = #{date} - AND deptid IN (${deptIds}) + TO_CHAR(ALARM_TIME,'yyyy-mm-dd') = #{date} + AND bwi.DEPTID IN (${deptIds}) AND bwi.VALID = '1'