springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
New file @@ -0,0 +1,161 @@ package com.panzhihua.common.model.dtos.community; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * 实有人口DTO */ @Data public class ComMngPopulationDTO implements Serializable { private static final long serialVersionUID = 1L; /** * 分页-当前页数 */ @ApiModelProperty(value = "分页-当前页数",example = "1") private Long pageNum; /** * 分页-每页记录数 */ @ApiModelProperty(value = "分页-每页记录数",example = "10") private Long pageSize; /** * 年龄开始查询字段 */ @ApiModelProperty("年龄开始查询字段") private String ageStart; /** * 年龄结束查询字段 */ @ApiModelProperty("年龄结束查询字段") private String ageEnd; /** * 籍贯 */ @ApiModelProperty("籍贯") private String nativePlace; /** * 民族 */ @ApiModelProperty("民族") private String nation; /** * 小区名字 */ @ApiModelProperty("小区名字") private String alley; /** * 主键id */ @ApiModelProperty(value="主键id") private Long id; /** * 街道id */ @ApiModelProperty(value="街道id",hidden = true) private Integer streetId; /** * 社区id */ @ApiModelProperty(value="社区id",hidden = true) private Integer actId; /** * 小区id（实有房屋id） */ @ApiModelProperty(value="小区id（实有房屋id）",hidden = true) private Integer villageId; /** * 家庭成员（姓名） */ @ApiModelProperty(value="家庭成员（姓名）") private String name; /** * 性别（1.男 2.女 3.未知） */ @ApiModelProperty(value="性别（1.男 2.女 3.未知）") private Integer sex; /** * 年龄 */ @ApiModelProperty(value="年龄") private Integer age; /** * 身份证号码 */ @ApiModelProperty(value="身份证号码") private String cardNo; /** * 街路巷 */ @ApiModelProperty(value="街路巷") private String road; /** * 门牌号 */ @ApiModelProperty(value="门牌号") private Integer doorNo; /** * 楼排号 */ @ApiModelProperty(value="楼排号") private String floor; /** * 单元号 */ @ApiModelProperty(value="单元号") private Integer unitNo; /** * 户室（房间号） */ @ApiModelProperty(value="户室（房间号）") private Integer houseNo; /** * 政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众) */ @ApiModelProperty(value="政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)") private Integer politicalOutlook; /** * 工作单位 */ @ApiModelProperty(value="工作单位") private String workCompany; /** * 特殊情况 */ @ApiModelProperty(value="特殊情况") private String specialSituation; /** * 联系方式 */ @ApiModelProperty(value="联系方式") private String phone; /** * 备注 */ @ApiModelProperty(value="备注") private String remark; /** * 标签集合（多个标签以,隔开） */ @ApiModelProperty(value="标签集合（多个标签以,隔开）") private String label; /** * 创建时间 */ @ApiModelProperty(value="创建时间") private Date createAt; /** * 修改时间 */ @ApiModelProperty(value="修改时间") private Date updateAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
New file @@ -0,0 +1,156 @@ package com.panzhihua.common.model.vos.community; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; /** * 实有人口Vo */ @Data @ApiModel("实有人口表") public class ComMngPopulationVO { /** * 自增 id */ @ApiModelProperty("实有人口id") private Long id; /** * 街道id */ @ApiModelProperty("街道id") private Integer streetId; /** * 社区id */ @ApiModelProperty("社区id") private Integer actId; /** * 小区id（实有房屋id） */ @ApiModelProperty("小区id（实有房屋id）") private Integer villageId; /** * 家庭成员（姓名） */ @ApiModelProperty("家庭成员（姓名）") @NotBlank(groups = {AddGroup.class},message = "家庭成员（姓名）不可为空") private String name; /** * 性别（1.男 2.女 3.未知） */ @ApiModelProperty("性别（1.男 2.女 3.未知）") @NotBlank(groups = {AddGroup.class},message = "性别不可为空") private Integer sex; /** * 年龄 */ @ApiModelProperty("年龄") @NotBlank(groups = {AddGroup.class},message = "年龄不可为空") private Integer age; /** * 身份证号码 */ @ApiModelProperty("身份证号码") @NotBlank(groups = {AddGroup.class},message = "身份证号码不可为空") private String cardNo; /** * 街路巷 */ @ApiModelProperty("街路巷") @NotBlank(groups = {AddGroup.class},message = "街路巷不可为空") private String road; /** * 门牌号 */ @ApiModelProperty("门牌号") @NotBlank(groups = {AddGroup.class},message = "门牌号不可为空") private Integer doorNo; /** * 楼排号 */ @ApiModelProperty("楼排号") @NotBlank(groups = {AddGroup.class},message = "楼排号不可为空") private String floor; /** * 单元号 */ @ApiModelProperty("单元号") @NotBlank(groups = {AddGroup.class},message = "单元号不可为空") private Integer unitNo; /** * 户室（房间号） */ @ApiModelProperty("户室（房间号）") @NotBlank(groups = {AddGroup.class},message = "户室（房间号）不可为空") private Integer houseNo; /** * 政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众) */ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)") @NotBlank(groups = {AddGroup.class},message = "政治面貌不可为空") private Integer politicalOutlook; /** * 工作单位 */ @ApiModelProperty("工作单位") private String workCompany; /** * 特殊情况 */ private String specialSituation; /** * 联系方式 */ @ApiModelProperty("联系方式") @NotBlank(groups = {AddGroup.class},message = "联系方式不可为空") private String phone; /** * 备注 */ @ApiModelProperty("备注") private String remark; /** * 标签集合（多个标签以,隔开） */ @ApiModelProperty("标签集合（多个标签以,隔开）") private String label; /** * 创建时间 */ @ApiModelProperty("创建时间") private Date createAt; /** * 修改时间 */ @ApiModelProperty("修改时间") private Date updateAt; /** * 籍贯 */ @ApiModelProperty("籍贯") private String nativePlace; /** * 民族 */ @ApiModelProperty("民族") private String nation; /** * 小区名字 */ @ApiModelProperty("小区名字") private String alley; /** * 家庭成员 */ @ApiModelProperty("家庭成员") private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1195,6 +1195,14 @@ @PostMapping("/common/data/car/import") R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list,@RequestParam("communityId") Long communityId); /** * 分页查询实有人口 * @param comMngPopulationVO 查询参数 * @return 分页集合 */ @PostMapping("/common/data/population/page") R pagePopulation(ComMngPopulationDTO comMngPopulationVO); /** * 社区后台实有单位管理列表 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -671,5 +671,11 @@ return communityService.getDistrictByCityCode(cityAdcode); } @ApiOperation(value = "分页查询实有人口列表", response = ComMngPopulationVO.class) @PostMapping("/population/pagePopulation") public R pageQueryComMngRealAssets(@RequestBody ComMngPopulationDTO comMngPopulationVO) { return communityService.pagePopulation(comMngPopulationVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -3,10 +3,7 @@ import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.service_community.service.ComMngCarService; import com.panzhihua.service_community.service.ComMngProvinceService; import com.panzhihua.service_community.service.ComMngRealAssetsService; import com.panzhihua.service_community.service.ComMngRealCompanyService; import com.panzhihua.service_community.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -34,6 +31,8 @@ @Resource private ComMngProvinceService comMngProvinceService; @Resource private ComMngPopulationService comMngPopulationService; /** * 小程序用户车辆登记 @@ -246,4 +245,14 @@ R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode){ return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode); } /** * 社区后台实有人口管理列表 * @param comMngPopulationVO 查询参数 * @return 实有人口分页查询结果 */ @PostMapping("/population/page") public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) { return comMngPopulationService.pagePopulation(comMngPopulationVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
New file @@ -0,0 +1,165 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; import com.panzhihua.common.model.vos.community.ComActMessageVO; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; import com.panzhihua.common.model.vos.community.PageComActMessageVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.service_community.model.dos.ComMngPopulationDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; /** * 实有人口Dao */ @Mapper public interface ComMngPopulationDAO extends BaseMapper<ComMngPopulationDO> { @Select("<script> " + "SELECT\n" + "cmp.`name`,\n" + "cmp.id,\n" + "cmp.street_id,\n" + "cmp.act_id,\n" + "cmp.village_id,\n" + "cmp.sex,\n" + "cmp.age,\n" + "cmp.card_no,\n" + "cmp.road,\n" + "cmp.door_no,\n" + "cmp.floor,\n" + "cmp.unit_no,\n" + "cmp.house_no,\n" + "cmp.political_outlook,\n" + "cmp.work_company,\n" + "cmp.special_situation,\n" + "cmp.phone,\n" + "cmp.remark,\n" + "cmv.alley,\n" + "cmp.native_place,\n" + "cmp.nation \n" + "FROM \n" + "com_mng_population AS cmp " + "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " + "<where>" + "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != ""'>" + "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " + " </if> " + "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road.trim() != ""'>" + "AND cmp.road LIKE concat(#{comMngPopulationVO.road},'%') " + " </if> " + "<if test='comMngPopulationVO.doorNo != null and comMngPopulationVO.doorNo.trim() != ""'>" + "AND cmp.door_no = #{comMngPopulationVO.doorNo} " + " </if> " + "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley.trim() != ""'>" + "AND cmv.alley LIKE concat(#{comMngPopulationVO.alley},'%') " + " </if> " + "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex.trim() != ""'>" + "AND cmp.sex = #{comMngPopulationVO.sex} " + " </if> " + "<if test='comMngPopulationVO.ageStart != null'>" + "AND cmp.age <![CDATA[ >= ]]> #{comMngPopulationVO.ageStart} " + " </if> " + "<if test='comMngPopulationVO.ageEnd != null'>" + "AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " + " </if> " + "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace.trim() != ""'>" + "AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " + " </if> " + "<if test='comMngPopulationVO.nation != null and comMngPopulationVO.nation.trim() != ""'>" + "AND cmp.nation = #{comMngPopulationVO.nation} " + " </if> " + "<if test='comMngPopulationVO.politicalOutlook != null and comMngPopulationVO.politicalOutlook.trim() != ""'>" + "AND cmp.political_outlook = #{comMngPopulationVO.politicalOutlook} " + " </if> " + "<if test='comMngPopulationVO.cardNo != null and comMngPopulationVO.cardNo.trim() != ""'>" + "AND cmp.card_no = #{comMngPopulationVO.cardNo} " + " </if> " + "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark.trim() != ""'>" + "AND cmp.remark = #{comMngPopulationVO.remark} " + " </if> " + " </where>" + "</script>") List<ComMngPopulationVO> listPopulation(ComMngPopulationDTO populationVO); @Select("select id,user_id,relationship,`name`,id_card,phone,age,health,job,create_at,update_at from com_mng_family_info where user_id=#{userId}") List<ComMngFamilyInfoVO> listFamilyByUserId(Long userId); @Select("<script> " + "SELECT\n" + "cmp.`name`,\n" + "cmp.id,\n" + "cmp.street_id,\n" + "cmp.act_id,\n" + "cmp.village_id,\n" + "cmp.sex,\n" + "cmp.age,\n" + "cmp.card_no,\n" + "cmp.road,\n" + "cmp.door_no,\n" + "cmp.floor,\n" + "cmp.unit_no,\n" + "cmp.house_no,\n" + "cmp.political_outlook,\n" + "cmp.work_company,\n" + "cmp.special_situation,\n" + "cmp.phone,\n" + "cmp.remark,\n" + "cmv.alley,\n" + "cmp.native_place,\n" + "cmp.nation \n" + "FROM \n" + "com_mng_population AS cmp " + "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " + "<where>" + "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != ""'>" + "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " + " </if> " + "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road.trim() != ""'>" + "AND cmp.road LIKE concat(#{comMngPopulationVO.road},'%') " + " </if> " + "<if test='comMngPopulationVO.doorNo != null and comMngPopulationVO.doorNo.trim() != ""'>" + "AND cmp.door_no = #{comMngPopulationVO.doorNo} " + " </if> " + "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley.trim() != ""'>" + "AND cmv.alley LIKE concat(#{comMngPopulationVO.alley},'%') " + " </if> " + "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex.trim() != ""'>" + "AND cmp.sex = #{comMngPopulationVO.sex} " + " </if> " + "<if test='comMngPopulationVO.ageStart != null'>" + "AND cmp.age <![CDATA[ >= ]]> #{comMngPopulationVO.ageStart} " + " </if> " + "<if test='comMngPopulationVO.ageEnd != null'>" + "AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " + " </if> " + "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace.trim() != ""'>" + "AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " + " </if> " + "<if test='comMngPopulationVO.nation != null and comMngPopulationVO.nation.trim() != ""'>" + "AND cmp.nation = #{comMngPopulationVO.nation} " + " </if> " + "<if test='comMngPopulationVO.politicalOutlook != null and comMngPopulationVO.politicalOutlook.trim() != ""'>" + "AND cmp.political_outlook = #{comMngPopulationVO.politicalOutlook} " + " </if> " + "<if test='comMngPopulationVO.cardNo != null and comMngPopulationVO.cardNo.trim() != ""'>" + "AND cmp.card_no = #{comMngPopulationVO.cardNo} " + " </if> " + "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark.trim() != ""'>" + "AND cmp.remark = #{comMngPopulationVO.remark} " + " </if> " + " </where>" + "</script>") IPage<ComMngPopulationVO> pagePopulation(Page page, @Param("comMngPopulationVO") ComMngPopulationDTO comMngPopulationVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
New file @@ -0,0 +1,116 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; import java.util.Date; @Data @TableName(value = "com_mng_population") public class ComMngPopulationDO implements Serializable { private static final long serialVersionUID = 1L; /** * 自增 id */ @TableId(type = IdType.AUTO) private Long id; /** * 街道id */ private Integer streetId; /** * 社区id */ private Integer actId; /** * 小区id（实有房屋id） */ private Integer villageId; /** * 家庭成员（姓名） */ private String name; /** * 性别（1.男 2.女 3.未知） */ private Integer sex; /** * 年龄 */ private Integer age; /** * 身份证号码 */ private String cardNo; /** * 街路巷 */ private String road; /** * 门牌号 */ private Integer doorNo; /** * 楼排号 */ private String floor; /** * 单元号 */ private Integer unitNo; /** * 户室（房间号） */ private Integer houseNo; /** * 政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众) */ private Integer politicalOutlook; /** * 工作单位 */ private String workCompany; /** * 特殊情况 */ private String specialSituation; /** * 联系方式 */ private String phone; /** * 备注 */ private String remark; /** * 标签集合（多个标签以,隔开） */ private String label; /** * 创建时间 */ private Date createAt; /** * 修改时间 */ private Date updateAt; /** * 籍贯 */ private String nativePlace; /** * 民族 */ private String nation; /** * 小区名字 */ private String villageName; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
New file @@ -0,0 +1,54 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; /** * 实有人口Service */ public interface ComMngPopulationService { /** * 新增实有人口 * @param comMngPopulationVO 实有人口信息 * @return 新增结果 */ R addPopulation(ComMngPopulationVO comMngPopulationVO); /** * 编辑实有人口 * @param comMngPopulationVO 编辑内容 * @return 编辑结果 */ R putPopulation(ComMngPopulationVO comMngPopulationVO); /** * 查询实有人口 * @param comMngPopulationVO 请求参数 * @return 实有人口集合 */ R listPopulation(ComMngPopulationDTO comMngPopulationVO); /** * 实有人口详情 * @param populationId 实有人口id * @return 实有人口详情 */ R detailPopulation(Long populationId); /** * 分页查询实有人口 * @param comMngPopulationVO 查询参数 * @return 分页集合 */ R pagePopulation(ComMngPopulationDTO comMngPopulationVO); /** * 查询平台所有的实有人口 * @return 实有人口集合 按照创建顺序倒序排列 */ R listPopulationAll(); /** * 删除实有人口 * @param populationId 实有人口id * @return 删除结果 */ R deletePopulation(Long populationId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
New file @@ -0,0 +1,172 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.service_community.dao.ComActActivityDAO; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComMngPopulationDAO; import com.panzhihua.service_community.model.dos.ComActActivityDO; import com.panzhihua.service_community.model.dos.ComActDO; import com.panzhihua.service_community.model.dos.ComMngPopulationDO; import com.panzhihua.service_community.service.ComMngPopulationService; import org.springframework.beans.BeanUtils; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * 实有人口Service实现类 */ @Service public class ComMngPopulationServiceImpl implements ComMngPopulationService { @Resource private ComMngPopulationDAO populationDAO; /** * 新增实有人口 * @param comMngPopulationVO 新增信息 * @return 新增结果 */ @Override public R addPopulation(ComMngPopulationVO comMngPopulationVO) { ComMngPopulationDO comMngPopulationDO=new ComMngPopulationDO(); Integer integer = populationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNo, comMngPopulationVO.getCardNo())); if (integer>0) { return R.fail("实有人口已经存在"); } BeanUtils.copyProperties(comMngPopulationVO,comMngPopulationDO); int nub = populationDAO.insert(comMngPopulationDO); if(nub < 1){ return R.fail(); } return R.ok(nub); } /** * 编辑实有人口 * @param comMngPopulationVO 编辑内容 * @return 编辑结果 */ @Override public R putPopulation(ComMngPopulationVO comMngPopulationVO) { ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(comMngPopulationVO.getId()); if (comMngPopulationDO == null) { return R.fail("未查询到人口记录"); } BeanUtils.copyProperties(comMngPopulationVO,comMngPopulationDO); int nub = populationDAO.updateById(comMngPopulationDO); if(nub < 1){ return R.fail(); } return R.ok(); } /** * 查询实有人口 * * @param comMngPopulationVO 查询条件 * @return 实有人口集合 */ @Override public R listPopulation(ComMngPopulationDTO comMngPopulationVO) { List<ComMngPopulationVO> populationVOS = populationDAO.listPopulation(comMngPopulationVO); return R.ok(populationVOS); } /** * 实有人口详情 * * @param populationId 实有人口id * @return 实有人口详情 */ @Override public R detailPopulation(Long populationId) { ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId); if (ObjectUtils.isEmpty(comMngPopulationDO)) { return R.fail(); } ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO(); BeanUtils.copyProperties(comMngPopulationDO,comMngPopulationVO); //查询家庭成员信息 List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = populationDAO.listFamilyByUserId(comMngPopulationDO.getId()); if(!comMngFamilyInfoVOS.isEmpty()){ comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS); } return R.ok(comMngPopulationVO); } /** * 分页查询社区 * * @param comMngPopulationVO 查询参数 * @return 分页集合 */ @Override public R pagePopulation(ComMngPopulationDTO comMngPopulationVO) { Page page = new Page<>(); Long pageNum = comMngPopulationVO.getPageNum(); Long pageSize = comMngPopulationVO.getPageSize(); if (null==pageNum||0==pageNum) { pageNum = 1l; } if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO); return R.ok(iPage); } /** * 删除实有人口 * * @param populationId 实有人口id * @return 删除结果 */ @Override public R deletePopulation(Long populationId) { int delete = populationDAO.deleteById(populationId); if (delete>0) { return R.ok(); } return R.fail(); } /** * 查询所有实有人口 * * @return 实有人口集合 按照创建顺序倒序排列 */ @Override public R listPopulationAll() { List<ComMngPopulationDO> populationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().orderByDesc(ComMngPopulationDO::getCreateAt)); List<ComMngPopulationVO> populationVOS=new ArrayList<>(); if (!ObjectUtils.isEmpty(populationDOS)) { populationDOS.forEach(comActDO -> { ComMngPopulationVO populationVO=new ComMngPopulationVO(); BeanUtils.copyProperties(comActDO,populationVO); populationVOS.add(populationVO); }); } return R.ok(populationVOS); } }
