diff --git a/src/main/java/com/hisense/monitormanage/dto/WaterPointDto.java b/src/main/java/com/hisense/monitormanage/dto/WaterPointDto.java index 4ced3cb..b000fa2 100644 --- a/src/main/java/com/hisense/monitormanage/dto/WaterPointDto.java +++ b/src/main/java/com/hisense/monitormanage/dto/WaterPointDto.java @@ -57,4 +57,6 @@ public class WaterPointDto { private String pointLevel;//积水点等级1:重度;2:中度;3:轻度;4:无积水 + private String waterPointDepth;//积水点深度 + } diff --git a/src/main/java/com/hisense/monitormanage/mapper/WaterPointMapper.java b/src/main/java/com/hisense/monitormanage/mapper/WaterPointMapper.java index 5852150..2008edd 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/WaterPointMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/WaterPointMapper.java @@ -15,7 +15,6 @@ import java.util.List; @Repository public interface WaterPointMapper extends BaseMapper { - @Select("select * from water_point wp LEFT JOIN water_point_report wpr ON wp.water_point_id = wpr.water_point_id WHERE wp.audit_flag = '2' and wp.disp_flag in (0,1)") List selectWaterPoint(); @Select("select * from water_point wp LEFT JOIN water_point_report wpr ON wp.water_point_id = wpr.water_point_id where audit_flag = '2' and disp_flag in (0,1) and report_origin = #{reportOrigin}") diff --git a/src/main/resources/mapper/WaterPointMapper.xml b/src/main/resources/mapper/WaterPointMapper.xml index 2746267..458aef3 100644 --- a/src/main/resources/mapper/WaterPointMapper.xml +++ b/src/main/resources/mapper/WaterPointMapper.xml @@ -1,5 +1,24 @@ - + \ No newline at end of file