社区后台实有人口详情增加家庭成员信息以及电子档信息

huanghongfa

2021-04-27 66e6e417d69c5ccebc61082519e4e65eff81b490

社区后台实有人口详情增加家庭成员信息以及电子档信息

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1639,6 +1639,14 @@
    @PostMapping("/common/data/population/detail")
    R detailPopulation(@RequestParam(value = "populationId") Long populationId);

    /**
     * 根据id查询实有人口电子档案信息
     * @param populationId  实有人口id
     * @return  实有人口电子档信息
     */
    @PostMapping("/common/data/population/electronicArchives")
    R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId);


    /**
     * 根据id修改实有人口标签列表

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -23,6 +23,7 @@
import com.panzhihua.common.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.FileUtil;
@@ -814,6 +815,12 @@
        return communityService.detailPopulation(populationId);
    }

    @ApiOperation(value = "查询实有人口电子档案", response = UserElectronicFileVO.class)
    @PostMapping("/population/electronicArchives")
    public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) {
        return communityService.electronicArchivesPopulation(populationId);
    }

    @ApiOperation(value = "实有人口标签修改", response = ComMngPopulationVO.class)
    @PostMapping("/population/editTag")
    public R editTagPopulation(@RequestBody ComMngPopulationTagDTO populationTagDTO) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java

@@ -298,6 +298,16 @@
        return comMngPopulationService.detailPopulation(populationId);
    }

    /**
     * 查询实有人口电子档信息
     * @param populationId  实有人口id
     * @return  实有人口电子档信息
     */
    @PostMapping("/population/electronicArchives")
    public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) {
        return comMngPopulationService.electronicArchivesPopulation(populationId);
    }


    /**
     * 根据实有人口id修改标签列表

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -93,7 +93,7 @@
    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}")
    @Select("select id,user_id,relationship,`name`,id_card,phone,age,health,job,create_at,update_at,card_photo_front,card_photo_back,family_book from com_mng_family_info where user_id=#{userId}")
    List<ComMngFamilyInfoVO> listFamilyByUserId(Long userId);

    @Select("select id,`name`,phone,relation from com_mng_population where road = #{comMngPopulationDO.road} and door_no = #{comMngPopulationDO.doorNo} and floor = #{comMngPopulationDO.floor} and unit_no = #{comMngPopulationDO.unitNo} and house_no = #{comMngPopulationDO.houseNo} and id != #{comMngPopulationDO.id}")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java

@@ -121,4 +121,11 @@
     * @return  删除结果
     */
    R deleteSpecialInputUser(Long id);

    /**
     * 查询实有人口电子档信息
     * @param populationId  实有人口id
     * @return  实有人口电子档信息
     */
    R electronicArchivesPopulation(Long populationId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -127,7 +127,7 @@
    public R detailPopulation(Long populationId) {
        ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
        if (ObjectUtils.isEmpty(comMngPopulationDO)) {
            return R.fail();
            return R.fail("用户信息不存在");
        }
        ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
        BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
@@ -469,4 +469,25 @@
            return R.fail();
        }
    }

    /**
     * 查询实有人口电子档信息
     * @param populationId  实有人口id
     * @return  实有人口电子档信息
     */
    @Override
    public R electronicArchivesPopulation(Long populationId){
        ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
        if (ObjectUtils.isEmpty(comMngPopulationDO)) {
            return R.fail("用户信息不存在");
        }
        //查询当前用户电子档信息
        if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){
            UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
            if(electronicFileVO != null){
                return R.ok(electronicFileVO);
            }
        }
        return R.ok();
    }
}