diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index bb2fbee..395c39d 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -209,7 +209,7 @@ DEVICEID, VALID, DEVICETYPENAME - FROM LIQUID_VIEW + FROM liquid_view and deptid = #{deptid} @@ -245,6 +245,13 @@ TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') + + #{endTime} + + + #{beginTime} + + SELECT @@ -533,7 +540,7 @@ deviceId, VALID, deviceTypeName - FROM WELLCOVER_MONITORVIEW + FROM wellcover_monitorview and deptid = #{deptid} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 315631b..ab1a15e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -103,9 +103,6 @@ to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - - - '%' || #{keywords}|| '%'