java/zhihuishenqu.git

			@@ -1,5 +1,7 @@
			package com.panzhihua.common.model.vos.partybuilding;

			import com.fasterxml.jackson.databind.annotation.JsonSerialize;
			import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			@@ -39,8 +41,10 @@
			@ApiModelProperty(value = "组织隶属（1.乡镇 2.机关 3.域市街道 3.域市社区（居委会） 4.农村社区居委会 5.建制村 6.国有经济控制 7.集体经济控制 8.非公有经济控制 9.事业单位 10.社会组织 11.其他）")
			private Integer subjection;
			@ApiModelProperty(value = "小区id")
			@JsonSerialize(using = ToStringSerializer.class)
			private Long areaId;
			@ApiModelProperty(value = "楼栋id")
			@JsonSerialize(using = ToStringSerializer.class)
			private Long buildId;
			@ApiModelProperty(value = "所属小区名字")
			private Long areaName;

			@@ -208,7 +208,7 @@
			<select id="getBuildListByVillageId" resultType="com.panzhihua.common.model.vos.community.building.admin.PageBuildingListAdminVo">
			SELECT
			cmb.id,
			cmb.`name`,
			cmb.`name`
			FROM
			com_mng_building AS cmb
			WHERE

			@@ -35,10 +35,12 @@
			cpo.address,
			cpo.longitude,
			cpo.latitude,
			cpo.type,
			cmr.`name` AS areaName,
			cmb.`name` AS buildName,
			cpmr.`name` AS userName,
			cpmr.phone AS phone
			cpmr.phone AS phone,
			(select count(id) from com_pb_member where org_id = cpo.id and audit_result = 1) as countPerson
			FROM
			com_pb_org AS cpo
			LEFT JOIN com_mng_residential AS cmr ON cmr.id = cpo.area_id
			@@ -79,6 +81,7 @@
			cpo.address,
			cpo.longitude,
			cpo.latitude,
			cpo.type,
			cmr.`name` AS areaName,
			cmb.`name` AS buildName,
			cpmr.`name` AS userName,
			@@ -121,6 +124,7 @@
			cpo.address,
			cpo.longitude,
			cpo.latitude,
			cpo.type,
			cmr.`name` AS areaName,
			cmb.`name` AS buildName,
			cpmr.`name` AS userName,

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史