pipIrr-SV.git - Gitblit

			@@ -15,7 +15,7 @@
			* @Description
			*/
			@Data
			@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address"})
			@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address", "rtuAddr", "protocol"})
			public class VoAllIntake implements BaseEntity {
			private static final long serialVersionUID = 202412161003001L;

			@@ -95,4 +95,14 @@
			* 地址
			*/
			private String address;

			/**
			* RTU地址
			*/
			private String rtuAddr;

			/**
			* 通讯协议
			*/
			private String protocol;
			}

			@@ -50,13 +50,16 @@
			ge.`operator`,
			ge.operateDt,
			blo.`name` AS blockName,
			CONCAT(country.`name`, town.`name`, village.`name`) AS address
			CONCAT(country.`name`, town.`name`, village.`name`) AS address,
			con.rtuAddr,
			con.protocol
			FROM pr_intake ge
			INNER JOIN pr_divide divi ON ge.divideId = divi.id
			INNER JOIN ba_block blo ON divi.blockId = blo.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
			INNER JOIN pr_controller con ON con.intakeId = ge.id
			where ge.id = #{id,jdbcType=BIGINT}
			AND ge.deleted = 0
			AND divi.deleted = 0

	pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史