pipIrr-SV.git - Gitblit

			@@ -133,15 +133,15 @@
			FROM pr_intake_controller
			<where>
			<if test = "intakeId != null and intakeId > 0">
			AND intakeId = ${intakeId}
			AND intakeId = #{intakeId,jdbcType=BIGINT}
			</if>

			<if test = "controllerId != null and controllerId > 0">
			AND controllerId = ${controllerId}
			AND controllerId = #{controllerId,jdbcType=BIGINT}
			</if>

			<if test = "operateType != null and operateType > 0">
			AND operateType = ${operateType}
			AND operateType = #{operateType,jdbcType=BIGINT}
			</if>
			</where>
			</select>
			@@ -153,16 +153,16 @@
			<!--con.code AS controllerCode,-->
			con.rtuAddr,
			(CASE
			WHEN ic.operateType = 1 THEN "绑定"
			WHEN ic.operateType = 2 THEN "解绑"
			WHEN ic.operateType = 1 THEN '绑定'
			WHEN ic.operateType = 2 THEN '解绑'
			END) AS operateType,
			ic.operateDt
			FROM pr_intake inta
			INNER JOIN pr_intake_controller ic ON inta.id= ic.intakeId
			INNER JOIN ba_user user ON ic.operator = user.id
			INNER JOIN pr_controller con ON ic.controllerId = con.id
			<if test = "intakeId != null and intakeId > 0">
			AND inta.id = ${intakeId}
			<if test = "intakeId != null">
			AND inta.id = #{intakeId,jdbcType=BIGINT}
			</if>
			ORDER BY ic.operateDt DESC
			</select>
			@@ -171,8 +171,8 @@
			<select id="getBindsByControllerId" resultType="java.util.Map">
			SELECT
			(CASE
			WHEN ic.operateType = 1 THEN "绑定"
			WHEN ic.operateType = 2 THEN "解绑"
			WHEN ic.operateType = 1 THEN '绑定'
			WHEN ic.operateType = 2 THEN '解绑'
			END) AS operateType,
			inta.name AS intakeName,
			user.name AS userName,
			@@ -181,11 +181,13 @@
			INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
			INNER JOIN pr_intake inta ON ic.intakeId = inta.id
			INNER JOIN ba_user user ON ic.operator = user.id
			<if test = "controllerId != null and controllerId > 0">
			AND con.id = ${controllerId}
			<if test = "controllerId != null">
			AND con.id = #{controllerId,jdbcType=BIGINT}
			</if>
			ORDER BY ic.operateDt DESC
			</select>


			<!--根据取水口编号修改绑定记录列表-->
			<update id="updateByIntakeSelective">
			update pr_intake_controller