1109高龄认证修改

101captain

2021-11-09 d4752748d55c54e70ff35927534c1235308ac1ec

1109高龄认证修改

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -12,6 +12,7 @@

import javax.annotation.Resource;

import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.ObjectUtils;
@@ -96,6 +97,7 @@
            if (!ObjectUtils.isEmpty(data)) {
                LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
                R r1 = communityService.detailHouse(userId);
                R r4=communityService.selectByIdCard(loginUserInfoVO.getIdCard());
                if (null != communityId && 0 != communityId) {
                    R r2 = communityService.detailCommunity(communityId);
                    if (R.isOk(r2)) {
@@ -125,6 +127,13 @@
                        r.setData(loginUserInfoVO);
                    }
                }
                if(R.isOk(r4)){
                    String address= (String) r4.getData();
                    if(StringUtils.isNotEmpty(address)){
                        loginUserInfoVO.setAddress(address);
                        r.setData(loginUserInfoVO);
                    }
                }
            }
        }
        return r;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -184,4 +184,7 @@
    @ApiModelProperty("是否社区工作人员 1.是 2.否")
    private Integer isCommunityWorker;

    @ApiModelProperty("实名认证地址")
    private String address;

}

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

@@ -2498,6 +2498,12 @@
    R pagePopulation(ComMngPopulationDTO comMngPopulationVO);

    /**
     * 根据身份证查询实有人口信息
     */
    @GetMapping("/common/data/population/selectByIdCard")
    R selectByIdCard(@RequestParam("idCard") String idCard);

    /**
     * 根据id实有人口详细信息
     *
     * @param populationId

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

@@ -602,6 +602,7 @@
    @PostMapping("/authRecord/add")
    R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        comElderAuthRecordVO.setSubmitUserId(this.getUserId());
        comElderAuthRecordVO.setCommunityId(this.getCommunityId());
        return communityService.addAuthRecord(comElderAuthRecordVO);
    }
    /**

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

@@ -6,6 +6,7 @@

import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -335,6 +336,18 @@
    }

    /**
     * 根据身份证查询实有人口信息
     */
    @GetMapping("/population/selectByIdCard")
    public R selectByIdCard(@RequestParam("idCard") String idCard){
        ComMngPopulationDO comMngPopulationDO=comMngPopulationService.getPopulationByCardNo(idCard);
        if(comMngPopulationDO!=null){
            return R.ok(comMngPopulationDO.getAddress());
        }
        return R.fail();
    }

    /**
     * 社区后台导入实有人口
     *
     * @param list

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

@@ -606,6 +606,7 @@
                    if(count==0){
                        ComElderAuthRecordsDO comElderAuthRecordsDO=new ComElderAuthRecordsDO();
                        BeanUtils.copyProperties(comElderAuthRecordVO,comElderAuthRecordsDO);
                        comElderAuthRecordsDO.setElderliesId(comElderAuthElderliesDO.getId());
                        comElderAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus());
                        comElderAuthRecordsDO.setApprovalDate(new Date());
                        comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());