pipIrr-SV.git - Gitblit

			@@ -24,6 +24,13 @@
			soil_humidity5, soil_temperature1, soil_temperature2, soil_temperature3, soil_temperature4,
			soil_temperature5
			</sql>
			<sql id="Base_Column_List_with_alias">
			<!--@mbg.generated-->
			${alias}.id, ${alias}.soil_id, ${alias}.dt, ${alias}.soil_humidity1,
			${alias}.soil_humidity2, ${alias}.soil_humidity3, ${alias}.soil_humidity4,
			${alias}.soil_humidity5, ${alias}.soil_temperature1, ${alias}.soil_temperature2,
			${alias}.soil_temperature3, ${alias}.soil_temperature4, ${alias}.soil_temperature5
			</sql>
			<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
			<!--@mbg.generated-->
			select
			@@ -47,7 +54,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>
			@@ -56,7 +63,9 @@
			<!--根据指定条件查询历史记录-->
			<select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoSoil">
			SELECT
			<include refid="Base_Column_List" />,
			<include refid="Base_Column_List_with_alias" >
			<property name="alias" value="htb"/>
			</include>,
			mtb.`name` AS soilName
			FROM rm_soil_history htb
			INNER JOIN pr_st_soil mtb ON mtb.id = htb.soil_id
			@@ -70,7 +79,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>