pipIrr-SV.git - Gitblit

			@@ -219,6 +219,7 @@
			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
			INNER JOIN pr_controller con ON con.intakeId = ge.id
			, (SELECT @i:=0) AS itable
			<where>
			ge.deleted = 0
			@@ -245,6 +246,10 @@
			divi.`name` AS divideName,
			blo.`name` AS blockName,
			ge.operateDt As operateDt,
			(CASE
			WHEN ge.id NOT IN(SELECT intakeId FROM pr_controller where deleted = 0) THEN "未绑定"
			WHEN ge.id IN(SELECT intakeId FROM pr_controller where deleted = 0) THEN "已绑定"
			END) AS isBind,
			CONCAT(country.`name`, town.`name`, village.`name`) AS address
			FROM pr_intake ge
			INNER JOIN pr_divide divi ON ge.divideId = divi.id
			@@ -252,6 +257,7 @@
			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
			INNER JOIN pr_controller con ON con.intakeId = ge.id
			, (SELECT @i:=0) AS itable
			<where>
			ge.deleted = 0