springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ExportDonatesVO.java
@@ -5,6 +5,7 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; import com.panzhihua.common.utlis.StringUtils; import lombok.Data; @@ -51,11 +52,15 @@ private String status; public void setIsAnonymous(String isAnonymous) { if (StringUtils.isNumber(isAnonymous)) { this.isAnonymous = nonNull(isAnonymous) && isAnonymous.equals("1") ? "是" : "否"; } else { this.isAnonymous = isAnonymous; } } public void setStatus(String status) { if (nonNull(status)) { if (StringUtils.isNumber(isAnonymous)) { switch (status) { case "1": this.status = "待签收"; @@ -67,6 +72,8 @@ this.status = "已取消"; break; } } else { this.status = status; } } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
@@ -74,4 +74,7 @@ @ApiModelProperty(value = "政治面貌文字描述") private String outlook; @ApiModelProperty(value = "人和房屋关系（1.业主 2.业主家属 3.租户）") private Integer relationId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
@@ -34,9 +34,9 @@ + " from com_mng_population_house where village_id = #{villageId}") ComMngVillageVO getStatisticsCount(@Param("villageId") Long villageId); @Select("select count(village_id) as villageTotal" + ",(select count(village_id) from com_mng_village where community_id = #{communityId} and type = 1) as townTotal" + ",(select count(village_id) from com_mng_village where community_id = #{communityId} and type = 2) as countrysideTotal" @Select("select count(distinct `name`) as villageTotal" + ",(select count(distinct `name`) from com_mng_village where community_id = #{communityId} and type = 1) as townTotal" + ",(select count(distinct `name`) from com_mng_village where community_id = #{communityId} and type = 2) as countrysideTotal" + " from com_mng_village where community_id = #{communityId}") ComMngVillageTotalVO getVillageStatisticsCount(@Param("communityId") Long communityId);
@@ -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)); } } } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -119,7 +119,7 @@ } Page userPage = new Page(pageComMngVillageDTO.getPageNum(), pageComMngVillageDTO.getPageSize()); IPage<ComMngVillageDO> doPager = comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComMngVillageDO::getCreateAt)); comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComMngVillageDO::getName)); IPage<ComMngVillageVO> villageVOIPage = new Page<>(); villageVOIPage.setCurrent(doPager.getCurrent()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml
@@ -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
