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

CeDo

2021-06-10 c7af0867cc62c363221ace3e1afaac8dd38df3a2

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

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

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.*;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("查询高龄老人认证记录请求参数")
public class PageComEldersAuthHistoryRecordDTO {

    @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键id", hidden = false, example = "1")
    private Long id;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "老人用户id", hidden = false, example = "1")
    private Long userId;


    @Length(max=50)
    @ApiModelProperty(value = "名称", hidden = false, example = "")
    private String name;


    @Length(max=50)
    @ApiModelProperty(value = "身份证号码", hidden = false, example = "")
    private String idCard;


    @Length(max=50)
    @ApiModelProperty(value = "出生年月", hidden = false, example = "")
    private String brithday;


    @Max(9999999999L)
    @ApiModelProperty(value = "年龄", hidden = false, example = "1")
    private Integer age;


    @Length(max=50)
    @ApiModelProperty(value = "户籍地", hidden = false, example = "")
    private String domicile;


    @Max(127)
    @ApiModelProperty(value = "本月是否已认证（1.是 2.否）", hidden = false, example = "1")
    private Integer isAuth;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long operUserId;
    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String operUserName;

}

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

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.*;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("查询老人认证月统计请求参数")
public class PageComEldersAuthStatisticsDTO {

    @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键id", hidden = false, example = "1")
    private Long id;


    @Max(9999999999L)
    @ApiModelProperty(value = "年份", hidden = false, example = "1")
    private Integer year;


    @Max(9999999999L)
    @ApiModelProperty(value = "月份", hidden = false, example = "1")
    private Integer month;


    @Max(9999999999L)
    @ApiModelProperty(value = "总人数", hidden = false, example = "1")
    private Integer sum;


    @Max(9999999999L)
    @ApiModelProperty(value = "认证人数", hidden = false, example = "1")
    private Integer authSum;


    @Max(9999999999L)
    @ApiModelProperty(value = "未认证人数", hidden = false, example = "1")
    private Integer noAuthSum;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long operUserId;
    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String operUserName;

}

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

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;

/**
 * 高领老人分页查询条件
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("高领老人分页查询条件")
public class PageEldersAuthHistoryDTO {

    @ApiModelProperty(value = "月份")
    private Integer month;

    @ApiModelProperty(value = "分页-当前页数,默认1", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "社区ID", hidden = true)
    private Long communityId;
}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("高龄老人认证记录详细返回参数")
public class ComEldersAuthHistoryRecordDetailsVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "老人用户id")
    private Long userId;

    @ApiModelProperty(value = "名称")
    private String name;

    @ApiModelProperty(value = "身份证号码")
    private String idCard;

    @ApiModelProperty(value = "出生年月")
    private String brithday;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "户籍地")
    private String domicile;

    @ApiModelProperty(value = "本月是否已认证（1.是 2.否）")
    private Integer isAuth;

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


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("高龄老人认证记录返回参数")
public class ComEldersAuthHistoryRecordVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "老人用户id")
    private Long userId;

    @ApiModelProperty(value = "名称")
    private String name;

    @ApiModelProperty(value = "身份证号码")
    private String idCard;

    @ApiModelProperty(value = "出生年月")
    private String brithday;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "户籍地")
    private String domicile;

    @ApiModelProperty(value = "本月是否已认证（1.是 2.否）")
    private Integer isAuth;

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


}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("高龄老人报表记录返回参数")
public class ComEldersAuthHistoryVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "年份")
    private Integer year;

    @ApiModelProperty(value = "月份")
    private Integer month;

    @ApiModelProperty(value = "高龄老人总人数")
    private Integer sum;

    @ApiModelProperty(value = "已认证人数")
    private Integer authSum;

    @ApiModelProperty(value = "未认证人数")
    private Integer noAuthSum;

}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("老人认证月统计详细返回参数")
public class ComEldersAuthStatisticsDetailsVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "年份")
    private Integer year;

    @ApiModelProperty(value = "月份")
    private Integer month;

    @ApiModelProperty(value = "总人数")
    private Integer sum;

    @ApiModelProperty(value = "认证人数")
    private Integer authSum;

    @ApiModelProperty(value = "未认证人数")
    private Integer noAuthSum;

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


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("老人认证月统计返回参数")
public class ComEldersAuthStatisticsVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "年份")
    private Integer year;

    @ApiModelProperty(value = "月份")
    private Integer month;

    @ApiModelProperty(value = "总人数")
    private Integer sum;

    @ApiModelProperty(value = "认证人数")
    private Integer authSum;

    @ApiModelProperty(value = "未认证人数")
    private Integer noAuthSum;

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


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java

@@ -630,6 +630,18 @@
        return dateString;
    }

    /**
     * 获取当前月第一天
     * @return
     */
    public static Date getFirstDayOfMonth() {
        Calendar cal = Calendar.getInstance();
        cal.add(Calendar.MONTH,0);
        int actualMinimum = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY),actualMinimum,00,00,00);
        return cal.getTime();
    }




@@ -638,6 +650,7 @@
//        Date date= new Date();
//        Date after = new Date();
//        System.out.println(calTimeDifference(date,after));
        System.out.println(getFirstDayOfMonth());

    }
}

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

New file
@@ -0,0 +1,46 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO;
import com.panzhihua.common.model.vos.community.ComEldersAuthHistoryVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/elders/history")
@Api(tags = {"高龄老人报表模块"})
public class EldersAuthHistoryApi {

    @Resource
    private CommunityService communityService;


    /**
     * 高领老人列表
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/page")
    @ApiOperation(value = "分页查询老人报表记录", response = ComEldersAuthHistoryVO.class)
    public R query(@Validated @RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){



//        return communityService.pageQueryEldersAuthHistory(pageEldersAuthElderlyDTO);
        return null;
    }


}

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

@@ -19,9 +19,8 @@
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.IdCardUtil;
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
@@ -85,6 +84,8 @@
    public ComMngPopulationDAO comMngPopulationDAO;
    @Resource
    public ComEldersAuthUserService comEldersAuthUserService;
    @Resource
    private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;

    /**
     * 新增社区活动
@@ -1606,6 +1607,21 @@
        eldersAuthDO.setBirthDay(birthDay);
        int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
        if(add==1){
            //认证成功  添加认证记录
            List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>()
                    .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,eldersAuthDO.getIdCard()).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
            if(authHistoryRecordDOList.isEmpty()){
                ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                authHistoryRecordDO.setUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
                authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
                BeanUtils.copyProperties(eldersAuthDO,authHistoryRecordDO);
                authHistoryRecordDO.setId(null);
                authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(eldersAuthDO.getIdCard())));
                authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(eldersAuthDO.getIdCard()));
                authHistoryRecordDO.setIsAuth(1);
                authHistoryRecordDO.setDomicile(domicile);
                comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
            }
            return R.ok(eldersAuthDO.getId());
        }


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

@@ -74,6 +74,7 @@
     * @param id
     * @return
     */
    @PostMapping("/delete")
    R deleteEldersAuthElderly(@RequestParam("id") Long id){
        return comEldersAuthElderlyService.deleteEldersAuthElderly(id);
    }

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

New file
@@ -0,0 +1,31 @@
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.PageComEldersAuthHistoryRecordDTO;
import com.panzhihua.service_community.model.dos.ComEldersAuthHistoryRecordDO;
import com.panzhihua.common.model.vos.community.ComEldersAuthHistoryRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-06-10
 * @since 1.0
 */
@Mapper
public interface ComEldersAuthHistoryRecordMapper extends BaseMapper<ComEldersAuthHistoryRecordDO> {

    /**
     * 分页查询
     *
     * @param pageComEldersAuthHistoryRecordDTO
     * @return
     */
    IPage<ComEldersAuthHistoryRecordVO> findByPage(Page page, @Param("pageComEldersAuthHistoryRecordDTO") PageComEldersAuthHistoryRecordDTO pageComEldersAuthHistoryRecordDTO);

}

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

New file
@@ -0,0 +1,30 @@
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.PageComEldersAuthStatisticsDTO;
import com.panzhihua.service_community.model.dos.ComEldersAuthStatisticsDO;
import com.panzhihua.common.model.vos.community.ComEldersAuthStatisticsVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Mapper
public interface ComEldersAuthStatisticsMapper extends BaseMapper<ComEldersAuthStatisticsDO> {

        /**
         * 分页查询
         * @param pageComEldersAuthStatisticsDTO
         * @return
         */
        IPage<ComEldersAuthStatisticsVO> findByPage(Page page, @Param("pageComEldersAuthStatisticsDTO") PageComEldersAuthStatisticsDTO pageComEldersAuthStatisticsDTO);

}

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

New file
@@ -0,0 +1,70 @@
package com.panzhihua.service_community.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 高龄老人认证记录实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@TableName("com_elders_auth_history_record")
public class ComEldersAuthHistoryRecordDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 老人用户id   列: user_id
     */
    private Long userId;
    /**
     * 认证记录id   列：auth_id
     */
    private Long authId;
    /**
     * 名称   列: name
     */
    private String name;
    /**
     * 身份证号码   列: id_card
     */
    private String idCard;
    /**
     * 出生年月   列: brithday
     */
    private String brithday;
    /**
     * 年龄   列: age
     */
    private Integer age;
    /**
     * 户籍地   列: domicile
     */
    private String domicile;
    /**
     * 本月是否已认证（1.是 2.否）   列: is_auth
     */
    private Integer isAuth;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

}

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

New file
@@ -0,0 +1,58 @@
package com.panzhihua.service_community.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 老人认证月统计实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@TableName("com_elders_auth_statistics")
public class ComEldersAuthStatisticsDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 年份   列: year
     */
    private Integer year;
    /**
     * 月份   列: month
     */
    private Integer month;
    /**
     * 总人数   列: sum
     */
    private Integer sum;
    /**
     * 认证人数   列: auth_sum
     */
    private Integer authSum;
    /**
     * 未认证人数   列: no_auth_sum
     */
    private Integer noAuthSum;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

}

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

@@ -19,6 +19,7 @@
import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.*;
@@ -53,6 +54,8 @@
    private ComEldersAuthElderlyMapper comEldersAuthElderlyMapper;
    @Resource
    private SysConfMapper sysConfDao;
    @Resource
    private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;

    /**
     * 新增高龄认证
@@ -256,6 +259,22 @@

            this.baseMapper.insert(eldersAuthDO);

            //认证成功  添加认证记录
            List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>()
                    .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,eldersAuthDO.getIdCard()).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
            if(authHistoryRecordDOList.isEmpty()){
                ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                authHistoryRecordDO.setUserId(authGetResultDTO.getAuthUserId());
                authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
                BeanUtils.copyProperties(eldersAuthDO,authHistoryRecordDO);
                authHistoryRecordDO.setId(null);
                authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(eldersAuthDO.getIdCard())));
                authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(eldersAuthDO.getIdCard()));
                authHistoryRecordDO.setIsAuth(1);
                authHistoryRecordDO.setDomicile(domicile);
                comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
            }

            authUserDO.setIsAuth(ComEldersAuthUserDO.isAuth.yes);
            comEldersAuthUserMapper.updateById(authUserDO);

@@ -373,6 +392,7 @@
        }
        return R.fail();
    }

    @Override
    public R pageQueryEldersAuthRecord(PageEldersAuthRecordDTO pageEldersAuthElderlyDTO) {
        Page page = new Page();
@@ -380,7 +400,6 @@
        page.setSize(pageEldersAuthElderlyDTO.getPageSize());
        return R.ok(eldersAuthDAO.selectCommunityEldersRecordByPage(page, pageEldersAuthElderlyDTO));
    }

    @Override
    public R setCommunityAuthType(Long communityId, Integer type) {
        List<SysConfDO> authConf =

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

New file
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_community.model.dos.ComEldersAuthHistoryRecordDO">
        <result property="id" column="id"/>
        <result property="userId" column="user_id"/>
        <result property="name" column="name"/>
        <result property="idCard" column="id_card"/>
        <result property="brithday" column="brithday"/>
        <result property="age" column="age"/>
        <result property="domicile" column="domicile"/>
        <result property="isAuth" column="is_auth"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,user_id,name,id_card,brithday,age,domicile,is_auth,create_at
    ]]>
    </sql>

    <!-- 分页查询 -->
    <select id="findByPage" resultType="com.panzhihua.common.model.vos.community.ComEldersAuthHistoryRecordVO"
        parameterType="com.panzhihua.common.model.dtos.community.PageComEldersAuthHistoryRecordDTO">
        SELECT <include refid="columns" />
        FROM com_elders_auth_history_record
        <where>
           <if test="pageComEldersAuthHistoryRecordDTO.id!=null">
                AND id = #{pageComEldersAuthHistoryRecordDTO.id}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.userId!=null">
                AND user_id = #{pageComEldersAuthHistoryRecordDTO.userId}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.name!=null">
                AND name = #{pageComEldersAuthHistoryRecordDTO.name}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.idCard!=null">
                AND id_card = #{pageComEldersAuthHistoryRecordDTO.idCard}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.brithday!=null">
                AND brithday = #{pageComEldersAuthHistoryRecordDTO.brithday}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.age!=null">
                AND age = #{pageComEldersAuthHistoryRecordDTO.age}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.domicile!=null">
                AND domicile = #{pageComEldersAuthHistoryRecordDTO.domicile}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.isAuth!=null">
                AND is_auth = #{pageComEldersAuthHistoryRecordDTO.isAuth}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageComEldersAuthHistoryRecordDTO.createAtBegin}
           </if>
           <if test="pageComEldersAuthHistoryRecordDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageComEldersAuthHistoryRecordDTO.createAtEnd}
           </if>
        </where>
        <if test="pageComEldersAuthHistoryRecordDTO.sortColumns!=null">
            ORDER BY ${pageComEldersAuthHistoryRecordDTO.sortColumns} ${pageComEldersAuthHistoryRecordDTO.sortType}
        </if>
    </select>

</mapper>

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

New file
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_community.dao.ComEldersAuthStatisticsMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_community.model.dos.ComEldersAuthStatisticsDO">
        <result property="id" column="id"/>
        <result property="year" column="year"/>
        <result property="month" column="month"/>
        <result property="sum" column="sum"/>
        <result property="authSum" column="auth_sum"/>
        <result property="noAuthSum" column="no_auth_sum"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,year,month,sum,auth_sum,no_auth_sum,create_at
    ]]>
    </sql>

    <!-- 分页查询 -->
    <select id="findByPage" resultType="com.panzhihua.common.model.vos.community.ComEldersAuthStatisticsVO"
        parameterType="com.panzhihua.common.model.dtos.community.PageComEldersAuthStatisticsDTO">
        SELECT <include refid="columns" />
        FROM com_elders_auth_statistics
        <where>
           <if test="pageComEldersAuthStatisticsDTO.id!=null">
                AND id = #{pageComEldersAuthStatisticsDTO.id}
            </if>
           <if test="pageComEldersAuthStatisticsDTO.year!=null">
                AND year = #{pageComEldersAuthStatisticsDTO.year}
            </if>
           <if test="pageComEldersAuthStatisticsDTO.month!=null">
                AND month = #{pageComEldersAuthStatisticsDTO.month}
            </if>
           <if test="pageComEldersAuthStatisticsDTO.sum!=null">
                AND sum = #{pageComEldersAuthStatisticsDTO.sum}
            </if>
           <if test="pageComEldersAuthStatisticsDTO.authSum!=null">
                AND auth_sum = #{pageComEldersAuthStatisticsDTO.authSum}
            </if>
           <if test="pageComEldersAuthStatisticsDTO.noAuthSum!=null">
                AND no_auth_sum = #{pageComEldersAuthStatisticsDTO.noAuthSum}
            </if>
           <if test="pageComEldersAuthStatisticsDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageComEldersAuthStatisticsDTO.createAtBegin}
           </if>
           <if test="pageComEldersAuthStatisticsDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageComEldersAuthStatisticsDTO.createAtEnd}
           </if>
        </where>
        <if test="pageComEldersAuthStatisticsDTO.sortColumns!=null">
            ORDER BY ${pageComEldersAuthStatisticsDTO.sortColumns} ${pageComEldersAuthStatisticsDTO.sortType}
        </if>
    </select>

</mapper>