diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 1079e12..fc1634b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -32,11 +32,11 @@ SELECT bdt.TYPE_NAME AS "deviceType", - COALESCE(A.deviceCount ,0) AS "deviceCount" + COALESCE(A.devicecount ,0) AS "deviceCount" FROM base_device_type bdt LEFT JOIN ( SELECT - COUNT( 1 ) AS deviceCount, + COUNT( 1 ) AS devicecount, BD.DEVICE_TYPE AS deviceType FROM bus_device BD LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index 567fbca..bdf2415 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -62,10 +62,10 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT , - COALESCE ("deviceCount",0) AS deviceCount + COALESCE (devicecount,0) AS "deviceCount" FROM bus_well_info w LEFT JOIN - (SELECT COUNT(1) AS "deviceCount",well_id + (SELECT COUNT(1) AS devicecount,well_id FROM bus_device_well d WHERE d.VALID = '1' GROUP BY well_id) c ON w.id = c.well_id WHERE w.VALID = '1'