pipIrr-SV.git - Gitblit

			@@ -216,9 +216,9 @@
			FROM pr_intake ge
			INNER JOIN pr_divide divi ON ge.divideId = divi.id
			INNER JOIN ba_block blo ON divi.blockId = blo.id
			INNER JOIN ba_district country ON ge.countyId = country.id
			INNER JOIN ba_district town ON ge.townId = town.id
			INNER JOIN ba_district village ON ge.villageId = village.id
			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
			<where>
			ge.deleted = 0
			AND divi.deleted = 0
			@@ -227,12 +227,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 divi.id = #{divideId}
			</if>

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

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

			<!--根据指定条件获取取水口记录-->
			<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,
			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 "未绑定"
			@@ -276,12 +283,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 divi.id = #{divideId}
			</if>

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

			<if test="isBinded == 0">