pipIrr-SV.git - Gitblit

			@@ -20,6 +20,13 @@
			id, weather_id, dt, air_temperature, air_humidity, ultraviolet, light_intensity,
			rainfall, wind_speed, wind_direction
			</sql>
			<sql id="Base_Column_List_with_alias">
			<!--@mbg.generated-->
			${alias}.id, ${alias}.weather_id, ${alias}.dt, ${alias}.air_temperature,
			${alias}.air_humidity, ${alias}.ultraviolet, ${alias}.light_intensity,
			${alias}.rainfall, ${alias}.wind_speed, ${alias}.wind_direction
			</sql>

			<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
			<!--@mbg.generated-->
			select
			@@ -43,7 +50,7 @@
			<if test = "name != null and name !=''">
			AND mtb.name LIKE CONCAT('%',#{name},'%')
			</if>
			<if test = "timeStart != null and timeStop != null">
			<if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
			AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
			</if>
			</where>
			@@ -52,7 +59,9 @@
			<!--根据指定条件查询历史记录-->
			<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoWeather">
			SELECT
			<include refid="Base_Column_List" />,
			<include refid="Base_Column_List_with_alias" >
			<property name="alias" value="htb"/>
			</include>,
			mtb.`name` AS weatherName
			FROM rm_weather_history htb
			INNER JOIN pr_st_weather mtb ON mtb.id = htb.weather_id
			@@ -66,7 +75,7 @@
			<if test = "name != null and name !=''">
			AND mtb.name LIKE CONCAT('%',#{name},'%')
			</if>
			<if test = "timeStart != null and timeStop != null">
			<if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
			AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
			</if>
			</where>