pipIrr-SV.git - Gitblit

			@@ -219,6 +219,7 @@
			LEFT JOIN ba_district country ON ge.countyId = country.id
			LEFT JOIN ba_district town ON ge.townId = town.id
			LEFT JOIN ba_district village ON ge.villageId = village.id
			LEFT JOIN pr_controller cont ON ge.id = cont.intakeId
			<where>
			ge.deleted = 0
			AND divi.deleted = 0
			@@ -227,12 +228,12 @@
			AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
			</if>

			<if test="divideName != null and divideName != ''">
			AND divi.name LIKE CONCAT('%', #{divideName}, '%')
			<if test = "divideId != null and divideId !=''">
			AND divi.id = #{divideId}
			</if>

			<if test="blockName != null and blockName != ''">
			AND blo.name = #{blockName}
			<if test = "blockId != null and blockId !=''">
			AND blo.id = #{blockId}
			</if>

			<if test="isBinded == 0">
			@@ -252,10 +253,19 @@

			<!--根据指定条件获取取水口记录-->
			<select id="getIntakes" resultType="com.dy.pipIrrGlobal.voPr.VoIntake">
			SELECT CAST(ge.id AS char) AS id,
			SELECT
			CAST(ge.id AS char) AS intakeId,
			ge.`name` AS intakeName,
			CAST(divi.id AS char) AS divideId,
			divi.`name` AS divideName,
			CAST(blo.id AS char) AS blockId,
			blo.`name` AS blockName,
			CAST(cont.id AS char) AS controllerId,
			cont.rtuAddr AS rtuAddr,
			ge.lng,
			ge.lat,
			ge.remarks,
			ge.operator,
			ge.operateDt As operateDt,
			(CASE
			WHEN ge.id NOT IN(SELECT intakeId FROM pr_controller where deleted = 0) THEN "未绑定"
			@@ -268,6 +278,7 @@
			LEFT JOIN ba_district country ON ge.countyId = country.id
			LEFT JOIN ba_district town ON ge.townId = town.id
			LEFT JOIN ba_district village ON ge.villageId = village.id
			LEFT JOIN pr_controller cont ON ge.id = cont.intakeId
			<where>
			ge.deleted = 0
			AND divi.deleted = 0
			@@ -276,12 +287,12 @@
			AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
			</if>

			<if test="divideName != null and divideName != ''">
			AND divi.name LIKE CONCAT('%', #{divideName}, '%')
			<if test = "divideId != null and divideId !=''">
			AND divi.id = #{divideId}
			</if>

			<if test="blockName != null and blockName != ''">
			AND blo.name = #{blockName}
			<if test = "blockId != null and blockId !=''">
			AND blo.id = #{blockId}
			</if>

			<if test="isBinded == 0">