1.山洪

tangzy

2022-07-21 a98b1db4392c357304036e8b3cdd01646920300d

 src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml

@@ -88,7 +88,7 @@
                            GROUP BY STCD) cs4 ON cs4.STCD = rs.STCD
        WHERE rs.TM > #{beginTime}
          AND rs.TM <= #{endTime}
        ORDER BY rs.TM DESC
        ORDER BY rs.RZ DESC
    </select>

    <select id="selectyjcd" resultType="java.util.HashMap">
@@ -314,14 +314,16 @@

    <!--水库站水位流量过程接口-->
    <select id="selectRsvrLists" resultType="java.util.HashMap">
        select * from dbo.ST_RIVER_R where STCD=#{code}
        select rs.*,rv.WRZ from dbo.ST_RIVER_R rs
        LEFT JOIN ( SELECT STCD, WRZ FROM dbo.ST_RVFCCH_B ) rv ON rv.STCD = rs.STCD
        where rs.STCD=#{code}
        <if test="dateBegin!=null and dateBegin!=''">
            AND TM &gt;=#{dateBegin}
            AND rs.TM &gt;=#{dateBegin}
        </if>
        <if test="dateEnd!=null and dateEnd!=''">
            and TM&lt;=#{dateEnd}
            and rs.TM&lt;=#{dateEnd}
        </if>
        ORDER BY TM DESC
        ORDER BY rs.TM DESC
    </select>