Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-20 ad0241fd6fe15600dde313cb28c9861be6c8089c

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java

@@ -1,6 +1,9 @@
package com.panzhihua.common.model.vos.community;

import java.util.*;

import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +27,7 @@
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "更新人")
@@ -35,6 +38,7 @@
    private Date updateAt;

    @ApiModelProperty(value = "身份证")
    @Sensitive(strategy = SensitiveStrategy.ID_CARD)
    private String idCard;

    @ApiModelProperty(value = "认证人姓名")

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

@@ -1546,7 +1546,8 @@

        List<ComMngFamilyInfoVO> listRt = new ArrayList<>();
        sortedList.forEach(rt -> {
            boolean isElders =  rt.getAge()>=80;
            int age = IdCard.IdNOToAge(rt.getIdCard());
            boolean isElders = age >= 80;
            if(isElders){
                listRt.add(rt);
            }
@@ -1583,6 +1584,9 @@
            //根据身份证查询出籍贯 出生日期
            //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
            String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
            if(StringUtils.isEmpty(domicile)){
                domicile = "暂无";
            }

            Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
            eldersAuthDO.setDomicile(domicile);

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

@@ -204,6 +204,9 @@
            if (comCvtServeDOS.size()>0 && errorInfo != null && errorInfo.size() > 0) {
                return R.fail("导入部分成功：" + errorInfo.toString());
            }
            if(comCvtServeDOS.size()==0  && errorInfo != null && errorInfo.size() > 0){
                return R.fail("导入失败：" + errorInfo.toString());
            }
        }
        return R.ok("共计导入服务数量："+comCvtServeDOS.size());
    }