pipIrr-SV.git - Gitblit

			@@ -611,7 +611,7 @@
			inta.name AS intakeNum,
			blo.name AS blockName
			FROM pr_intake inta
			LEFT JOIN (SELECT intake_id
			INNER JOIN (SELECT intake_id
			FROM rm_open_close_valve_history
			WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
			) his ON his.intake_id = inta.id
			@@ -629,7 +629,7 @@
			inta.lat AS lat,
			blo.name AS blockName
			FROM pr_intake inta
			LEFT JOIN(SELECT intake_id
			INNER JOIN(SELECT intake_id
			FROM rm_open_close_valve_history
			WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
			) his ON his.intake_id = inta.id
			@@ -653,7 +653,7 @@
			inta.name AS intakeNum,
			blo.name AS blockName
			FROM pr_intake inta
			LEFT JOIN (SELECT intake_id
			INNER JOIN (SELECT intake_id
			FROM rm_open_close_valve_history
			WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
			) his ON his.intake_id = inta.id
			@@ -671,7 +671,7 @@
			inta.lat AS lat,
			blo.name AS blockName
			FROM pr_intake inta
			LEFT JOIN(SELECT intake_id
			INNER JOIN(SELECT intake_id
			FROM rm_open_close_valve_history
			WHERE id <![CDATA[>=]]> #{idStart} AND id <![CDATA[<=]]> #{idEnd}
			) his ON his.intake_id = inta.id
			@@ -1336,8 +1336,8 @@
			count(ocvh.id) as times
			from rm_open_close_valve_history ocvh
			inner join se_client_card cc on CAST(cc.cardNum AS CHAR) = ocvh.cl_ic_card_no
			where ocvh.cl_dt <![CDATA[>=]]> #{startDt, jdbcType=BIGINT}
			and ocvh.cl_dt <![CDATA[<=]]> #{endDt, jdbcType=BIGINT}
			where ocvh.cl_dt <![CDATA[>=]]> #{startDt, jdbcType=TIMESTAMP }
			and ocvh.cl_dt <![CDATA[<=]]> #{endDt, jdbcType=TIMESTAMP}
			group by ocvh.client_id, cc.id
			</select>
			<select id="statisticsByClient" resultType="com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics">
			@@ -1347,8 +1347,8 @@
			sum(cl_this_time) as duration,
			count(id) as times
			from rm_open_close_valve_history
			where cl_dt <![CDATA[>=]]> #{startDt, jdbcType=BIGINT}
			and cl_dt <![CDATA[<=]]> #{endDt, jdbcType=BIGINT}
			where cl_dt <![CDATA[>=]]> #{startDt, jdbcType=TIMESTAMP}
			and cl_dt <![CDATA[<=]]> #{endDt, jdbcType=TIMESTAMP}
			group by client_id
			</select>
			</mapper>