diff --git a/user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java b/user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java index 9f9c81f..2a9aefb 100644 --- a/user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/NowDataMapper.java @@ -462,9 +462,9 @@ public interface NowDataMapper { " SELECT " + " 1 " + " FROM " + - " now_data " + + " now_data n1 " + " WHERE " + - " up_water_state = '运行') THEN '运行' " + + " n1.up_water_state = '运行' AND n1.building_id = now_data.building_id) THEN '运行' " + " ELSE '不运行' " + " END AS up_water_state, " + " CASE " + @@ -472,9 +472,9 @@ public interface NowDataMapper { " SELECT " + " 1 " + " FROM " + - " now_data " + + " now_data n2 " + " WHERE " + - " use_water_state = '运行') THEN '运行' " + + " n2.use_water_state = '运行' AND n2.building_id = now_data.building_id) THEN '运行' " + " ELSE '不运行' " + " END AS use_water_state, " + " CASE " + @@ -482,9 +482,9 @@ public interface NowDataMapper { " SELECT " + " 1 " + " FROM " + - " now_data " + + " now_data n3 " + " WHERE " + - " back_water_state = '运行') THEN '运行' " + + " n3.back_water_state = '运行' AND n3.building_id = now_data.building_id) THEN '运行' " + " ELSE '不运行' " + " END AS back_water_state " + "FROM " + @@ -493,6 +493,7 @@ public interface NowDataMapper { " building_id = #{buildingId} and convert(varchar(10), cur_date, 120) = convert(varchar(10), getdate(), 120) ") Map selectTopOneState(@Param("buildingId") String buildingId); + @Select("