springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java
@@ -19,6 +19,9 @@ @ApiModelProperty(value = "是否是居住地(1.是 2.否)") private Integer isResidence; @ApiModelProperty("与户主关系") private Integer relation; /** * 是否是居住地(1.是 2.否) */ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
@@ -17,6 +17,16 @@ @JsonSerialize(using = ToStringSerializer.class) private Long houseId; @ApiModelProperty("人口id") @JsonSerialize(using = ToStringSerializer.class) private Long populId; @ApiModelProperty("人和房屋关系") private Integer relationId; @ApiModelProperty("与户主关系") private Integer relation; @ApiModelProperty("房屋地址") private String address;
@@ -446,10 +446,12 @@ R r =communityService.getVillageById(Ids.get(0)); if (R.isOk(r)){ populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationListByVillageId(Ids.get(0)).getData()),ComMngPopulationVO.class); } }else { populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationLists(Ids).getData()),ComMngPopulationVO.class); } }else { populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationLists(Ids).getData()),ComMngPopulationVO.class); } }else{//导出全部 populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationListByCommunityId(communityId).getData()),ComMngPopulationVO.class); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -9,6 +9,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO; import com.panzhihua.common.model.vos.community.ComMngVillageVO; import com.panzhihua.service_community.model.dos.ComMngVillageDO; import com.panzhihua.service_community.service.ComMngPopulationHouseService; import com.panzhihua.service_community.service.ComMngPopulationHouseUserService; import com.panzhihua.service_community.service.ComMngPopulationService; @@ -80,8 +81,11 @@ */ @PostMapping("getVillageById") public R getVillageById(@RequestParam(value = "villageId")Long villageId){ R r = comMngVillageService.getVillageById(villageId); return R.ok(r); ComMngVillageDO comMngVillageDO = comMngVillageService.getVillageById(villageId); if (comMngVillageDO != null) { return R.ok(comMngVillageDO); } return R.fail(); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
@@ -26,7 +26,7 @@ @Mapper public interface ComMngPopulationHouseDAO extends BaseMapper<ComMngPopulationHouseDO> { @Select("select cmphu.house_id,cmph.address,cmph.status from com_mng_population_house_user cmphu " + @Select("select cmphu.house_id,cmph.address,cmph.status,cmphu.popul_id,cmphu.popul_id,cmphu.relation_id,cmphu.relation from com_mng_population_house_user cmphu " + " left join com_mng_population_house as cmph on cmph.id = cmphu.house_id " + " where cmphu.popul_id = #{populId}") List<ComMngHouseVo> getPopulHouseListByPopulId(@Param("populId")Long populId); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
@@ -8,6 +8,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO; import com.panzhihua.common.model.vos.community.ComMngVillageVO; import com.panzhihua.service_community.model.dos.ComMngVillageDO; import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -37,7 +38,7 @@ * @param villageId 查询条件 * @return 查询结果 */ R getVillageById(Long villageId); ComMngVillageDO getVillageById(Long villageId); /** * 分页查询实有房屋 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -803,6 +803,7 @@ populationHouseUserDO.setId(Snowflake.getId()); populationHouseUserDO.setPopulId(populationDO.getId()); populationHouseUserDO.setHouseId(houseEditDto.getId()); populationHouseUserDO.setRelation(houseEditDto.getRelation()); if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) { houseId = houseEditDto.getId();//居住地 } @@ -834,19 +835,19 @@ } } ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda() .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId())); if (comMngPopulationHouseUserDO != null) { comMngPopulationHouseUserDO.setRelation(vo.getRelation()); comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO); }else { comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO(); comMngPopulationHouseUserDO.setId(Snowflake.getId()); comMngPopulationHouseUserDO.setPopulId(vo.getId()); comMngPopulationHouseUserDO.setRelation(vo.getRelation()); comMngPopulationHouseUserDO.setCreateAt(new Date()); comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO); } // ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda() // .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId())); // if (comMngPopulationHouseUserDO != null) { // comMngPopulationHouseUserDO.setRelation(vo.getRelation()); // comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO); // }else { // comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO(); // comMngPopulationHouseUserDO.setId(Snowflake.getId()); // comMngPopulationHouseUserDO.setPopulId(vo.getId()); // comMngPopulationHouseUserDO.setRelation(vo.getRelation()); // comMngPopulationHouseUserDO.setCreateAt(new Date()); // comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO); // } if (populationDAO.updateById(populationDO) > 0) { return R.ok(); } else { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -94,13 +94,10 @@ } @Override public R getVillageById(Long villageId) { public ComMngVillageDO getVillageById(Long villageId) { ComMngVillageDO comMngVillageDO = new ComMngVillageDO(); comMngVillageDO = comActVillageDAO.selectById(villageId); if (comMngVillageDO != null) { return R.ok(comMngVillageDO); } return R.fail(); return comMngVillageDO; }
