Merge branch 'test' into test_bak

101captain

2021-09-30 3f50420b42259a88f7e623b16c14b00f52071f4c

Merge branch 'test' into test_bak

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java

@@ -214,4 +214,12 @@

    @ApiModelProperty("关键词")
    private String keyWord;

    @ApiModelProperty("等级是否查询全部（1.是 2.否）")
    private Integer levelIsAll;

    public interface levelIsAll{
        int yes = 1;
        int no = 2;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseAdminDTO.java

@@ -123,4 +123,12 @@
    @ApiModelProperty(value = "房屋地址")
    private Long address;

    @ApiModelProperty("等级是否查询全部（1.是 2.否）")
    private Integer levelIsAll;

    public interface levelIsAll{
        int yes = 1;
        int no = 2;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java

@@ -119,6 +119,12 @@
    private Integer isHiddenDanger;

    /**
     * 隐患类型(1.火灾隐患2.汛情隐患3.疫情隐患)
     */
    @ApiModelProperty("隐患类型(1.火灾隐患2.汛情隐患3.疫情隐患)，多条以逗号隔开")
    private String hiddenDangerType;

    /**
     * 隐患名称
     */
    @ApiModelProperty("隐患名称")
@@ -200,6 +206,15 @@
    }

    /**
     * 巡查类型
     */
    public interface hiddenDangerType {
        int huo = 1;
        int xun = 2;
        int yi = 3;
    }

    /**
     * 是否
     */
    public interface isOk {

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

@@ -8,8 +8,10 @@

import javax.validation.constraints.Min;
import javax.validation.constraints.Pattern;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @author zzj
@@ -85,4 +87,11 @@

    @ApiModelProperty("id数组")
    private Integer[] ids;

    @ApiModelProperty("管辖区域")
    private String jurisdictionContent;

    @ApiModelProperty("管辖区域数组")
    private List<String> jurisdictionContentList;

}

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

New file
@@ -0,0 +1,252 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.ComMngHouseVo;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
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("实有人口表")
@EncryptDecryptClass
public class ComMngPopulationNoSecretVO {

    /**
     * 自增 id
     */
    @ApiModelProperty("实有人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 街道id
     */
    @ApiModelProperty("街道id")
    private Integer streetId;
    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Integer actId;
    /**
     * 小区id（实有房屋id）
     */
    @ApiModelProperty("小区id（实有房屋id）")
    @JsonSerialize(using = ToStringSerializer.class)
    private long villageId;
    /**
     * 家庭成员（姓名）
     */
    @ApiModelProperty("家庭成员（姓名）")
    @NotBlank(groups = {AddGroup.class}, message = "家庭成员（姓名）不可为空")
    private String name;

    @ApiModelProperty("性别（1.男 2.女 3.未知）")
    @NotBlank(groups = {AddGroup.class}, message = "性别不可为空")
    private Integer sex;

    @ApiModelProperty("年龄")
    @NotBlank(groups = {AddGroup.class}, message = "年龄不可为空")
    private Integer age;

    @ApiModelProperty("身份证号码")
    private String cardNo;

    @ApiModelProperty("出生年月")
    private String birthday;

    @ApiModelProperty("街路巷")
    @NotBlank(groups = {AddGroup.class}, message = "街路巷不可为空")
    private String road;

    @ApiModelProperty("门牌号")
    @NotBlank(groups = {AddGroup.class}, message = "门牌号不可为空")
    private String doorNo;

    @ApiModelProperty("楼排号")
    @NotBlank(groups = {AddGroup.class}, message = "楼排号不可为空")
    private String floor;

    @ApiModelProperty("单元号")
    @NotBlank(groups = {AddGroup.class}, message = "单元号不可为空")
    private String unitNo;

    @ApiModelProperty("户室（房间号）")
    @NotBlank(groups = {AddGroup.class}, message = "户室（房间号）不可为空")
    private String houseNo;

    @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 politicalOutlookName;

    @ApiModelProperty("工作单位")
    private String workCompany;

    @ApiModelProperty("特殊情况")
    private String specialSituation;

    @ApiModelProperty("联系方式")
    @NotBlank(groups = {AddGroup.class}, message = "联系方式不可为空")
    private String phone;

    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("标签集合（多个标签以,隔开,如物业工作人员,物业")
    private String label;

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

    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty("籍贯")
    private String nativePlace;

    @ApiModelProperty("民族")
    private String nationCode;

    @ApiModelProperty("民族")
    private String nation;

    @ApiModelProperty("小区名字")
    private String alley;

    @ApiModelProperty("户主关系列表")
    private List<ComHouseMemberVo> comMngFamilyInfoVOS;

    @ApiModelProperty("家庭成员信息")
    private List<ComMngFamilyInfoVO> familyInfoVOList;

    @ApiModelProperty("用户电子档信息")
    private UserElectronicFileVO userElectronicFileVO;

    @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
    @NotBlank(groups = {AddGroup.class}, message = "是否租住不可为空")
    private Integer isRent;

    @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
    private Integer cultureLevel;

    @ApiModelProperty("文化程度名称")
    private String cultureLevelName;

    @ApiModelProperty("职业")
    private String profession;

    @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
    private Integer marriage;

    @ApiModelProperty("婚姻状况名称")
    private String marriageName;

    @ApiModelProperty("健康状况")
    private String healthy;

    @ApiModelProperty("外地or本地（1.本地  2.外地）")
    private Integer outOrLocal;

    @ApiModelProperty("户口所在地")
    private String censusRegister;

    /**
     * 居住地址
     */
    @ApiModelProperty("居住地址")
    private String address;

    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
    private Integer relation;

    @ApiModelProperty("与户主关系名称")
    private String relationName;

    @ApiModelProperty("身份证无加密字段")
    private String cardNoStr;

    @ApiModelProperty("房屋列表")
    private List<ComMngHouseVo> houseList;

    @ApiModelProperty("车辆列表")
    private List<ComMngPopulationCarVO> carList;

    @ApiModelProperty("吸毒信息")
    private List<ComDrugPopulationVO> comDrugPopulationVOs;

    @ApiModelProperty("社区矫正信息")
    private List<ComCorrectPopulationVO> comCorrectPopulationVOs;

    @ApiModelProperty("精神障碍信息")
    private List<ComMajorPopulationVO> comMajorPopulationVOs;

    @ApiModelProperty("邪教信息")
    private List<ComCultPopulationVO> comCultPopulationVOs;

    @ApiModelProperty("刑释信息")
    private List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOs;

    @ApiModelProperty("上访信息")
    private List<ComKeyPopulationVO> comKeyPopulationVOs;

    @ApiModelProperty("退役军人信息")
    private List<ComVeteransPopulationVO> comVeteransPopulationVOs;

    @ApiModelProperty("残疾人信息")
    private List<ComDisabilityPopulationVO> comDisabilityPopulationVOs;

    @ApiModelProperty("低保户信息")
    private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs;

    @ApiModelProperty("高龄老人信息")
    private List<ComElderAuthElderliesVO> comElderAuthElderliesVOList;

    @ApiModelProperty("养老人员信息")
    private List<ComPensionAuthPensionerVO> comPensionAuthPensionerVOList;

    public interface sex {
        int nan = 1;
        int nv = 2;
        int no = 3;
    }

    /**
     * 是否租住
     */
    public interface isOk {
        int yes = 1;
        int no = 0;
    }

    /**
     * 政治面貌
     */
    public interface politicalOutlook {
        int dang = 1;
        int tuan = 3;
        int wu = 12;
        int qun = 13;
        int no = 13;
    }
}

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

@@ -13,7 +13,7 @@
@ApiModel
public class FourMemberDetailVO {
    @ApiModelProperty("基础数据及房屋数据")
    private ComMngPopulationVO comMngPopulationVO;
    private ComMngPopulationNoSecretVO comMngPopulationVO;
    @ApiModelProperty("党员数据")
    private ComPbMemberVO partyBuildingMemberVO;
}

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

@@ -6108,6 +6108,16 @@
    R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 查询房屋二级级联菜单后台
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @PostMapping("/common/data/population/second/listBack")
    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 微心愿处理人列表
     * @param communityId   社区id
     * @param type  处理人类型（1.后台用户  2.党员  3.志愿者）

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

@@ -127,6 +127,7 @@
    @ApiOperation(value = "编辑群团组织成员")
    @PostMapping("/member/edit")
    public R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto) {
        editClusterMemberAdminDto.setCommunityId(this.getCommunityId());
        return communityService.editClusterMemberAdmin(editClusterMemberAdminDto);
    }


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

@@ -27,6 +27,7 @@
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.config.SFTPConfig;
import com.panzhihua.community_backstage.excel.Custemhandler;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -515,11 +516,9 @@
                    contentWriteCellStyle.setWrapped(true);
                    HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                            new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
                    LongestMatchColumnWidthStyleStrategy longestMatchColumnWidthStyleStrategy = new LongestMatchColumnWidthStyleStrategy();

                    excelWriter = EasyExcel.write(fileName, ComMngPopulationExcelVo.class)
                            .registerWriteHandler(horizontalCellStyleStrategy)
                            .registerWriteHandler(longestMatchColumnWidthStyleStrategy)
                            .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new Custemhandler())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").head(headList).build();
                    excelWriter.write(datalist, writeSheet);

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

@@ -2764,6 +2764,20 @@
        return communityService.getSecondHouseAddress(cascadeHouseDTO);
    }

    /**
     * 查询房屋二级级联菜单后台
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @ApiOperation(value = "房屋级联菜单查询")
    @PostMapping("/second/listBack")
    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        cascadeHouseDTO.setCommunityId(this.getCommunityId());
        return communityService.getSecondHouse(cascadeHouseDTO);
    }

    @ApiOperation(value = "分页查询实有房屋列表", response = ComMngPopulationHouseAdminVO.class)
    @PostMapping("/pageHouse")
    public R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/Custemhandler.java

New file
@@ -0,0 +1,36 @@
package com.panzhihua.community_backstage.excel;

import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
import org.apache.poi.ss.usermodel.Cell;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.List;

public class Custemhandler extends AbstractColumnWidthStyleStrategy {
    private static final int MAX_COLUMN_WIDTH = 100;
    //the maximum column width in Excel is 255 characters

    public Custemhandler() {
    }

    @Override
    protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
        if (isHead && cell.getRowIndex() != 0) {
            int columnWidth = cell.getStringCellValue().getBytes().length;
            if (columnWidth > MAX_COLUMN_WIDTH) {
                columnWidth = MAX_COLUMN_WIDTH;
            } else {
                columnWidth = columnWidth + 3;
            }
            writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 256);

        }
    }


    private final static Logger logger = LoggerFactory.getLogger(Custemhandler.class);
}

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

@@ -768,6 +768,18 @@
    }

    /**
     * 查询房屋二级级联菜单后台
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @PostMapping("/population/second/listBack")
    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        return comMngPopulationHouseService.getSecondHouse(cascadeHouseDTO);
    }

    /**
     * 分页查询房屋列表
     *
     * @param populationHouseAdminDTO

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

@@ -26,4 +26,5 @@
     */
    IPage<ComActFourMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
    ComActFourMemberVO getById(Integer id);
    ComActFourMemberVO getByIdVillage(Integer id);
}

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

@@ -20,5 +20,7 @@

    List<String> find(String ids);

    List<String> findByVillage(String ids);

    List<VillageVO> select(Long id);
}

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

@@ -691,6 +691,13 @@
    List<VillageVO> getSecondHouseAddress(Long communityId);

    /**
     * 房屋二级联动后台
     * @param communityId
     * @return
     */
    List<VillageVO> getSecondHouse(Long communityId);

    /**
     * 四长四员分页查询
     * @param page
     * @param commonPage

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java

@@ -71,4 +71,5 @@

    private String password;

    private String idCard;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthRecordsDO.java

@@ -29,7 +29,7 @@
    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.AUTO)
    private Long id;

    /**

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

@@ -39,6 +39,15 @@
    R getSecondHouseAddress(CascadeHouseDTO cascadeHouseDTO);

    /**
     * 查询二级房屋级联菜单后台
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    R getSecondHouse(CascadeHouseDTO cascadeHouseDTO);

    /**
     * 分页查询房屋列表
     * 
     * @param populationHouseAdminDTO

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

@@ -12,10 +12,7 @@
import com.panzhihua.common.enums.PopulRelationEnum;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationDetailVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.FourMemberDetailVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
@@ -38,6 +35,7 @@
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

@@ -66,16 +64,31 @@
    private ComMngPopulationHouseDAO comMngPopulationHouseDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
        IPage<ComActFourMemberVO> comActFourMemberVOIPage=comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage);
        if(!comActFourMemberVOIPage.getRecords().isEmpty()){
            comActFourMemberVOIPage.getRecords().forEach(comActFourMemberVO -> {
                if(comActFourMemberVO.getJurisdictionContent()!=null){
                    comActFourMemberVO.setJurisdictionContentList(JSON.parseArray(comActFourMemberVO.getJurisdictionContent(),String.class));
                }
            });
        }
        return R.ok(comActFourMemberVOIPage);
    }

    @Override
    public R insert(ComActFourMemberVO comActFourMemberVO) {
        if(comActFourMemberVO!=null&&comActFourMemberVO.getJurisdiction()!=null){
            ComActFourMember comActFourMember=new ComActFourMember();
            List<String> jurisdictionList=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
            List<String> jurisdictionList=new ArrayList<>();
            List<String> jurisdictionList1=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
            List<String> jurisdictionList2=comMngBuildingDAO.findByVillage(comActFourMemberVO.getJurisdiction());
            if(!jurisdictionList1.isEmpty()){
                jurisdictionList.addAll(jurisdictionList1);
            }
            if(!jurisdictionList2.isEmpty()){
                jurisdictionList.addAll(jurisdictionList2);
            }
            if(!jurisdictionList.isEmpty()&&jurisdictionList.size()==jurisdictionList.stream().distinct().collect(Collectors.toList()).size()){
                comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
                administratorsUserVO.setType(3);
@@ -84,6 +97,7 @@
                    comActFourMemberVO.setUserId(Long.parseLong(r.getData().toString()));
                    comActFourMemberVO.setCreateTime(DateUtil.date());
                    BeanUtils.copyProperties(comActFourMemberVO,comActFourMember);
                    comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
                    this.comActFourMemberDao.insert(comActFourMember);
                    return R.ok();
                }
@@ -205,7 +219,7 @@
        // comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday()));
        // }

        ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
        ComMngPopulationNoSecretVO comMngPopulationVO = new ComMngPopulationNoSecretVO();
        BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);

        // 查询户主关系信息

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

@@ -275,8 +275,10 @@
        Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize());
        IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO);
        doPager.getRecords().forEach(data -> {
            if (data.getUserType() != 1) {
                data.setReleaseName(data.getCommunityName());
            if(data.getUserType()!=null){
                if (data.getUserType() != 1) {
                    data.setReleaseName(data.getCommunityName());
                }
            }
        });
        return R.ok(doPager);

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

@@ -223,7 +223,7 @@
            }

            //判断民族是否存在
            if(!isOnly(memberExcel.getNation(),nationMap)){
            if(isOnly(memberExcel.getNation(),nationMap)){
                ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
                BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
                memberExcelErrorVO.setError("您填写的民族不存在");

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

@@ -38,7 +38,6 @@
import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
@@ -393,7 +392,6 @@
            ,  ComElderAuthElderliesDO comElderAuthElderliesDO, String authPeriod, Long userId, Long communityId,Date date) {
        ComElderAuthRecordsDO comElderAuthRecordsDO = new ComElderAuthRecordsDO();
        BeanUtils.copyProperties(vo, comElderAuthRecordsDO);
        comElderAuthRecordsDO.setId(Snowflake.getId());
        comElderAuthRecordsDO.setElderliesId(comElderAuthElderliesDO.getId());
        comElderAuthRecordsDO.setAuthPeriod(authPeriod);
        comElderAuthRecordsDO.setSubmitUserId(userId);

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

@@ -171,6 +171,11 @@
        return R.ok(this.comMngPopulationDAO.getSecondHouseAddress(cascadeHouseDTO.getCommunityId()));
    }

    @Override
    public R getSecondHouse(CascadeHouseDTO cascadeHouseDTO) {
        return R.ok(this.comMngPopulationDAO.getSecondHouse(cascadeHouseDTO.getCommunityId()));
    }

    /**
     * 分页查询房屋列表
     *
@@ -190,25 +195,27 @@
                        break;
                    case 2:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
//                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        break;
                    case 3:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
//                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
                        break;
                    case 4:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
                        populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
//                        populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
                        break;
                    case 5:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
                        populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
                        populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo());
                        if(populationHouseAdminDTO.getLevelIsAll() == null){
                            populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo());
                        }
                        break;
                    default:
                        break;

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

@@ -472,25 +472,27 @@
                        break;
                    case 2:
                        comMngPopulationVO.setRoad(houseDO.getAlley());
                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
//                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                        break;
                    case 3:
                        comMngPopulationVO.setRoad(houseDO.getAlley());
                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                        comMngPopulationVO.setFloor(houseDO.getFloor());
//                        comMngPopulationVO.setFloor(houseDO.getFloor());
                        break;
                    case 4:
                        comMngPopulationVO.setRoad(houseDO.getAlley());
                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                        comMngPopulationVO.setFloor(houseDO.getFloor());
                        comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
//                        comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
                        break;
                    case 5:
                        comMngPopulationVO.setRoad(houseDO.getAlley());
                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                        comMngPopulationVO.setFloor(houseDO.getFloor());
                        comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
                        comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
                        if(comMngPopulationVO.getLevelIsAll() == null){
                            comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
                        }
                        break;
                    default:
                        break;

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

@@ -15,10 +15,6 @@

import javax.annotation.Resource;

import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -30,7 +26,6 @@
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.enums.PopulHouseUseEnum;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
@@ -46,8 +41,10 @@
import com.panzhihua.common.model.vos.community.SysConfVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComPensionAuthPensionerDAO;
@@ -62,6 +59,7 @@
import com.panzhihua.service_community.model.dos.SysConfDO;
import com.panzhihua.service_community.service.ComPensionAuthRecordService;

import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;

/**
@@ -406,7 +404,6 @@
            ,  ComPensionAuthPensionerDO comPensionAuthPensionerDO, String authPeriod, Long userId, Long communityId,Date date) {
        ComPensionAuthRecordDO comPensionAuthRecordDO = new ComPensionAuthRecordDO();
        BeanUtils.copyProperties(vo, comPensionAuthRecordDO);
        comPensionAuthRecordDO.setId(Snowflake.getId());
        comPensionAuthRecordDO.setPensionerId(comPensionAuthPensionerDO.getId());
        comPensionAuthRecordDO.setAuthPeriod(authPeriod);
        comPensionAuthRecordDO.setSubmitUserId(userId);

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

@@ -1,7 +1,9 @@
package com.panzhihua.service_community.service.impl;

import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;

import javax.annotation.Resource;
@@ -33,6 +35,9 @@
import com.panzhihua.service_community.service.ComSwPatrolRecordService;

import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;
import static org.apache.commons.lang3.StringUtils.isBlank;

/**
 * @auther txb
@@ -89,20 +94,16 @@

    @Override
    public R addPatrolRecord(ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO) {
        // 巡查记录
        ComSwPatrolRecordDO comSwPatrolRecordDO = new ComSwPatrolRecordDO();
        BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO);
        Long patrolRecordId = Snowflake.getId();
        comSwPatrolRecordDO.setId(patrolRecordId);
        if(StringUtils.isEmpty(comSwPatrolRecordAddDTO.getPatrolTime())){
            comSwPatrolRecordDO.setPatrolTime(new Date());
        }else {
            comSwPatrolRecordDO.setPatrolTime(
                    DateUtils.stringToDate(comSwPatrolRecordAddDTO.getPatrolTime(), DateUtils.yyyyMMdd_format));
        String patrolTypeString = comSwPatrolRecordAddDTO.getPatrolType();
        Integer isHiddenDanger = comSwPatrolRecordAddDTO.getIsHiddenDanger();
        String hiddenDangerTypeString = comSwPatrolRecordAddDTO.getHiddenDangerType();
        if (isBlank(patrolTypeString)) {
            return R.fail("巡查类型不能为空");
        }
//        comSwPatrolRecordDO.setPatrolTime(new Date());
        comSwPatrolRecordDO.setSuccessionTime(
            DateUtils.stringToDate(comSwPatrolRecordAddDTO.getSuccessionTime(), DateUtils.yyyyMMdd_format));
        if (isNull(isHiddenDanger) || (isHiddenDanger.intValue() == ComSwPatrolRecordAddDTO.isOk.yes
                && isBlank(hiddenDangerTypeString))) {
            return R.fail("隐患类型不能为空");
        }
        StringBuilder nameString = new StringBuilder();
        StringBuilder phoneString = new StringBuilder();
        // 根据传递的巡查人员id查询巡查人员的名字和电话
@@ -120,48 +121,67 @@
                }
            }
        }
        comSwPatrolRecordDO.setPersonName(nameString.toString());
        comSwPatrolRecordDO.setPersonPhone(phoneString.toString());
        comSwPatrolRecordDAO.insert(comSwPatrolRecordDO);
        // 巡查记录和关联报告信息
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = new ComSwPatrolRecordReportDO();
        Long patrolRecordReport = Snowflake.getId();
        comSwPatrolRecordReportDO.setId(patrolRecordReport);
        comSwPatrolRecordReportDO.setPatrolRecordId(patrolRecordId);
        if (StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDangerDescription())) {
            comSwPatrolRecordAddDTO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription());
        }
        if (StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDagerName())) {
            comSwPatrolRecordAddDTO.setDangerName(comSwPatrolRecordAddDTO.getDagerName());
        }
        if (comSwPatrolRecordAddDTO.getIsHiddenDanger().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) {
            // 如果存在安全隐患，自动生成安全隐患报告
            ComSwDangerReportDO comSwDangerReportDO = new ComSwDangerReportDO();
            Long dangerReportId = Snowflake.getId();
            comSwDangerReportDO.setId(dangerReportId);
            comSwPatrolRecordReportDO.setReportId(dangerReportId);
            comSwDangerReportDO.setDangerType(comSwPatrolRecordAddDTO.getPatrolType());
            if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes
                && StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getTakeSteps())) {
                comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode()));
                comSwDangerReportDO.setRectifyTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
            } else {
                comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.DCL.getCode()));
        List<String> patrolTypes = Arrays.asList(patrolTypeString.split(","));
        patrolTypes.forEach(patrolType -> {
            // 巡查记录
            ComSwPatrolRecordDO comSwPatrolRecordDO = new ComSwPatrolRecordDO();
            BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO);
            Long patrolRecordId = Snowflake.getId();
            comSwPatrolRecordDO.setId(patrolRecordId);
            comSwPatrolRecordDO.setPatrolType(patrolType);
            if(StringUtils.isEmpty(comSwPatrolRecordAddDTO.getPatrolTime())){
                comSwPatrolRecordDO.setPatrolTime(new Date());
            }else {
                comSwPatrolRecordDO.setPatrolTime(
                        DateUtils.stringToDate(comSwPatrolRecordAddDTO.getPatrolTime(), DateUtils.yyyyMMdd_format));
            }
            BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
            comSwDangerReportDO.setPersonName(comSwPatrolRecordAddDTO.getDPersonName());
            comSwDangerReportDO.setPersonPhone(comSwPatrolRecordAddDTO.getDPersonPhone());
            comSwDangerReportDAO.insert(comSwDangerReportDO);
        } else {
            // 不存在安全隐患，生成安全工作记录
            ComSwSafetyWorkRecordDO comSwSafetyWorkRecordDO = new ComSwSafetyWorkRecordDO();
            BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwSafetyWorkRecordDO);
            Long safetyWorkRecord = Snowflake.getId();
            comSwSafetyWorkRecordDO.setId(safetyWorkRecord);
            comSwPatrolRecordReportDO.setReportId(safetyWorkRecord);
            comSwSafetyWorkRecordDAO.insert(comSwSafetyWorkRecordDO);
        }
        comSwPatrolRecordReportDAO.insert(comSwPatrolRecordReportDO);
//        comSwPatrolRecordDO.setPatrolTime(new Date());
            comSwPatrolRecordDO.setSuccessionTime(
                    DateUtils.stringToDate(comSwPatrolRecordAddDTO.getSuccessionTime(), DateUtils.yyyyMMdd_format));
            comSwPatrolRecordDO.setPersonName(nameString.toString());
            comSwPatrolRecordDO.setPersonPhone(phoneString.toString());
            comSwPatrolRecordDAO.insert(comSwPatrolRecordDO);
            // 巡查记录和关联报告信息
            ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = new ComSwPatrolRecordReportDO();
            Long patrolRecordReport = Snowflake.getId();
            comSwPatrolRecordReportDO.setId(patrolRecordReport);
            comSwPatrolRecordReportDO.setPatrolRecordId(patrolRecordId);

            if (isHiddenDanger.intValue() == ComSwPatrolRecordAddDTO.isOk.yes && hiddenDangerTypeString.contains(patrolType)) {
                // 如果存在安全隐患，自动生成安全隐患报告
                ComSwDangerReportDO comSwDangerReportDO = new ComSwDangerReportDO();
                Long dangerReportId = Snowflake.getId();
                comSwDangerReportDO.setId(dangerReportId);
                comSwPatrolRecordReportDO.setReportId(dangerReportId);
                comSwDangerReportDO.setDangerType(patrolType);
                if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes
                        && StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getTakeSteps())) {
                    comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode()));
                    comSwDangerReportDO.setRectifyTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
                } else {
                    comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.DCL.getCode()));
                }
                BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
                comSwDangerReportDO.setPersonName(comSwPatrolRecordAddDTO.getDPersonName());
                comSwDangerReportDO.setPersonPhone(comSwPatrolRecordAddDTO.getDPersonPhone());
                comSwDangerReportDAO.insert(comSwDangerReportDO);
            } else {
                // 不存在安全隐患，生成安全工作记录
                ComSwSafetyWorkRecordDO comSwSafetyWorkRecordDO = new ComSwSafetyWorkRecordDO();
                BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwSafetyWorkRecordDO);
                Long safetyWorkRecord = Snowflake.getId();
                comSwSafetyWorkRecordDO.setId(safetyWorkRecord);
                comSwPatrolRecordReportDO.setReportId(safetyWorkRecord);
                comSwSafetyWorkRecordDAO.insert(comSwSafetyWorkRecordDO);
            }
            comSwPatrolRecordReportDAO.insert(comSwPatrolRecordReportDO);
        });
        return R.ok();
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActFourMemberMapper.xml

@@ -10,6 +10,7 @@
        <result property="communityId" column="community_id"/>
        <result property="createTime" column="create_time"/>
        <result property="jurisdictionContent" column="jurisdiction_content"/>
        <result property="idCard" column="id_card"/>
    </resultMap>

    <resultMap id="baseResultMap" type="com.panzhihua.common.model.vos.community.ComActFourMemberVO">
@@ -21,7 +22,7 @@
    </resultMap>

    <select id="pageList" resultMap="baseResultMap">
        select t.*,t1.* from com_act_four_member t left join sys_user t1 on t.user_id = t1.user_id
        select t.*,t1.*,t2.role_id from com_act_four_member t left join sys_user t1 on t.user_id = t1.user_id left join sys_user_role t2 on t.user_id =t2.user_id
        <where>
            1=1
            <if test="commonPage.paramId !=null">
@@ -45,7 +46,7 @@
    </select>

    <select id="getById" resultMap="baseResultMap">
        select t.*,t1.* from com_act_four_member t left join sys_user t1 on t.user_id = t1.user_id where t.id =#{id}
        select t.*,t1.*,t2.role_id from com_act_four_member t left join sys_user t1 on t.user_id = t1.user_id left join sys_user_role t2 on t.user_id =t2.user_id where t.id =#{id}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml

@@ -194,9 +194,6 @@
        <foreach collection="comElderAuthRecordsDOS" item="item" index="index" separator=";">
            update com_elder_auth_records
            <set>
                <if test="item.id != null">
                    `id` = #{item.id},
                </if>
                <if test="item.elderliesId != null">
                    `elderlies_id` = #{item.elderliesId},
                </if>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml

@@ -35,6 +35,10 @@
        select distinct concat(alley,house_num,'号',IFNULL(floor,0),'栋') from com_mng_population_house   where id in (${id})
    </select>

    <select id="findByVillage" resultType="String">
        select distinct concat(alley,house_num,'号') from com_mng_village   where village_id in (${id})
    </select>

    <resultMap id="selectMap" type="com.panzhihua.common.model.vos.community.VillageVO">
        <result property="value" column="villageId"/>
        <result property="label" column="villageName"/>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -267,7 +267,11 @@
    </resultMap>

    <select id="getSecondHouseAddress" resultMap="selectMap">
        select t.village_id as villageId,concat(t.alley,t.house_num,'号') as villageName,t1.id,concat(t1.unit_no,'栋',t1.floor,'单元',t1.code,'号') as name  from com_mng_village t left join com_mng_population_house t1 on t.village_id = t1.village_id where t.community_id=#{communityId} and t1.id is not null
        select t.village_id as villageId,concat(t.alley,t.house_num,'号') as villageName,t1.id,concat(t1.unit_no,'栋',t1.floor,'单元',t1.code,'号') as name  from com_mng_village t left join com_mng_population_house t1 on t.village_id = t1.village_id where t.community_id=#{communityId}
    </select>

    <select id="getSecondHouse" resultMap="selectMap">
        select t.village_id as villageId,concat(t.alley,t.house_num,'号') as villageName,t1.id,concat(t1.unit_no,'栋') as name  from com_mng_village t left join com_mng_population_house t1  on t.village_id = t1.village_id where t.community_id=#{communityId} GROUP BY t.village_id,t1.unit_no
    </select>



 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml

@@ -187,9 +187,6 @@
        <foreach collection="comPensionAuthRecordDOS" item="item" index="index" separator=";">
            update com_pension_auth_records
            <set>
                <if test="item.id != null">
                    `id` = #{item.id},
                </if>
                <if test="item.pensionerId != null">
                    `pensioner_id` = #{item.pensionerId},
                </if>

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java

@@ -65,6 +65,7 @@
    @OnMessage
    public void onMessage(String message, Session session) {
        // 提取数据
        logger.info("收到的原始数据：{}", message);
        dealData(message);
    }

@@ -75,9 +76,10 @@
        if (deviceInfo.getCallstatus().equals("RINGING")) {
            logger.info("收到设备报警信息：{}", message);
            ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
            comPropertyAlarm.setSerialNo(deviceInfo.getCallid());
            comPropertyAlarm.setStatus(1);
            comPropertyAlarm.setSerialNo(deviceInfo.getUserid());
            comPropertyAlarm.setStatus(0);
            comPropertyAlarm.setCreateTime(new Date());
            comPropertyAlarm.setType(1);
            comPropertyAlarmDao.insert(comPropertyAlarm);
        }
    }

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComActFourMember.java

@@ -69,4 +69,6 @@

    private String password;

    private String idCard;

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

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

import javax.annotation.Resource;

import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import org.apache.commons.lang.time.DateFormatUtils;
@@ -341,7 +342,7 @@
                loginUserInfoVO.setVolunteerStatus(state);
            }
            //是否四长四员
            Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getUserId,sysUserDO.getUserId()));
            Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard()));
            if(countFourMember>0){
                loginUserInfoVO.setIsFourMember(1);
            }
@@ -781,7 +782,7 @@
        sysUserDO.setIdCard(idCard);
        // 通过身份证号判断性别以及出生日期
        sysUserDO.setSex(IdCard.sex(idCard));
        sysUserDO.setBirthday(IdCard.birthDay(idCard));
        sysUserDO.setBirthday(IdcardUtil.getBirthDate(idCard));
        if (!StringUtils.isEmpty(loginUserInfoVO.getJob())) {
            sysUserDO.setJob(loginUserInfoVO.getJob());
        }