java/zhihuishenqu.git

			@@ -9,6 +9,7 @@
			import javax.annotation.Resource;

			import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
			import com.panzhihua.common.utlis.StringUtils;
			import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;
			@@ -580,7 +581,8 @@
			//查询该房屋下人员的关联信息的关系
			for (ComMngPopulationHouseUserDO houseUser : houseUserList) {
			population = comMngPopulationDAO.selectById(houseUser.getPopulId());
			if(population.getIsRent().equals(ComMngPopulationDO.isOk.yes)){
			if(population != null){
			if(population.getIsRent() != null && population.getIsRent().equals(ComMngPopulationDO.isOk.yes)){
			houseUser.setRelationId(ComMngPopulationHouseUserDO.relationId.zuhu);
			}else {
			houseUser.setRelationId(ComMngPopulationHouseUserDO.relationId.zuzhu);
			@@ -588,15 +590,22 @@
			updateHouseUserList.add(houseUser);
			}
			}
			}

			//查看房子的楼层排序
			if(house.getFloorNum() == null){
			if(house.getFloorNum() == null && StringUtils.isNotEmpty(house.getHouseNo())){
			boolean result = house.getHouseNo().matches("[0-9]+");
			if (result) {// 该字段为纯数字
			if (house.getHouseNo().length() == 4) {
			house.setFloorNum(Integer.parseInt(house.getHouseNo().substring(0, 2).replaceAll("^(0+)", "")));
			String floorNum = house.getHouseNo().substring(0, 2).replaceAll("^(0+)", "");
			if(StringUtils.isNotEmpty(floorNum)){
			house.setFloorNum(Integer.parseInt(floorNum));
			}
			} else if (house.getHouseNo().length() == 3) {
			house.setFloorNum(Integer.parseInt(house.getHouseNo().substring(0, 1).replaceAll("^(0+)", "")));
			String floorNum = house.getHouseNo().substring(0, 1).replaceAll("^(0+)", "");
			if(StringUtils.isNotEmpty(floorNum)){
			house.setFloorNum(Integer.parseInt(floorNum));
			}
			}
			}
			}

			@@ -62,7 +62,7 @@
			cmb.`name`,
			cmv.`name` AS villageName,
			cmv.house_num as doorNum,
			cmb.unit_total,
			(select count(distinct unit_no) from com_mng_population_house where village_id = cmb.village_id AND floor = cmb.`name`) as unit_total,
			cmb.build_floor_sum,
			(select count(id) from com_mng_population_house where village_id = cmb.village_id and floor = cmb.`name`) as houseNum,
			(select count(id) from com_mng_population where village_id = cmb.village_id and floor = cmb.`name`) as populationNum
			@@ -176,6 +176,7 @@
			cmp.address,
			cmp.nation,
			cmphu.create_at,
			cmphu.relation_id,
			cmp.political_outlook
			FROM
			com_mng_population_house_user AS cmphu

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -74,4 +74,7 @@

			@ApiModelProperty(value = "政治面貌文字描述")
			private String outlook;

			@ApiModelProperty(value = "人和房屋关系（1.业主 2.业主家属 3.租户）")
			private Integer relationId;
			}