pipIrr-SV.git - Gitblit

			@@ -200,12 +200,12 @@
			SELECT
			COUNT(*) AS recordCount
			FROM rm_on_hour_report_history oh
			INNER JOIN pr_intake inta ON inta.id = oh.intake_id
			INNER JOIN pr_intake inta ON inta.id = oh.intake_id
			<where>
			<if test="intakeId != null and intakeId >0">
			AND oh.intake_id = #{intakeId}
			</if>
			<if test = "intakeName != null and intakeNum !=''">
			<if test = "intakeNum != null and intakeNum !=''">
			AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
			</if>
			<if test = "rtuAddr != null and rtuAddr !=''">
			@@ -235,16 +235,16 @@
			INNER JOIN pr_intake inta ON inta.id = oh.intake_id
			<where>
			<if test="intakeId != null and intakeId >0">
			AND oh.intake_id = #{intakeId}
			AND oh.intake_id = #{intakeId,jdbcType=BIGINT}
			</if>
			<if test = "intakeNum != null and intakeNum !=''">
			AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
			AND inta.name LIKE CONCAT('%',#{intakeNum,jdbcType=VARCHAR},'%')
			</if>
			<if test = "rtuAddr != null and rtuAddr !=''">
			AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
			AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr,jdbcType=VARCHAR},'%')
			</if>
			<if test = "timeStart != null and timeStop != null">
			AND oh.dt BETWEEN #{timeStart} AND #{timeStop}
			AND oh.dt BETWEEN #{timeStart,jdbcType=INTEGER} AND #{timeStop,jdbcType=INTEGER}
			</if>
			</where>
			ORDER BY oh.dt DESC