身份认证缺失接口开发

huanghongfa

2021-09-18 ae669d20c7e42fef2478cf8ce0824f1b05684d0b

身份认证缺失接口开发

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -196,4 +196,16 @@
     * 社区议事投票小程序身份验证参数默认key
     */
    public static final String DISCUSS_IDENTITY_KEY = "DISCUSS_IDENTITY_";
    /**
     * 常量
     */
    public static final Integer EIGHTY = 80;
    /**
     * 常量
     */
    public static final Integer NINETY = 90;
    /**
     * 常量
     */
    public static final Integer ONE_HUNDRED = 100;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComElderAuthRecordImportExcelListen.java

@@ -166,20 +166,19 @@
                    continue;
                }
                vo.setAuthDate(DateUtil.parse(oneData.get(4).trim(), parsePatterns));
                if (StringUtils.isNotEmpty(oneData.get(5))) {
                    Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(5));
                    if (isOk.equals(-1)) {
                        index++;
                        ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
                        setElderAuthMistake(oneData, mistake);
                        mistake.setMistake("您填写的健在（是/否）有误");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setIsAlive(isOk);
                } else {
                    vo.setIsAlive(PopulHouseUseEnum.getCodeByName("否"));
                if (StringUtils.isEmpty(oneData.get(5))) {
                    index++;
                    ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
                    setElderAuthMistake(oneData, mistake);
                    mistake.setMistake("认证期数不能为空");
                    mistakes.add(mistake);
                    continue;
                }
                vo.setAuthPeriod(oneData.get(5));
                if (StringUtils.isNotEmpty(oneData.get(6))) {
                    vo.setMark(oneData.get(6));
                }

                voList.add(vo);
                index++;
            }
@@ -223,6 +222,7 @@
        vo.setPhone(map.get(2));
        vo.setNowAddress(map.get(3));
        vo.setAuthDate(map.get(4));
        vo.setIsAlive(map.get(5));
        vo.setAuthPeriod(map.get(5));
        vo.setMark(map.get(6));
    }
}

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

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

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

/**
 * @author lyq
 * 高龄老人认证统计表头查询参数
 */
@Data
@ApiModel("高龄老人认证统计表头查询参数")
public class ElderAuthStatisticHeaderDTO {

    @ApiModelProperty(value = "认证期数",required = true)
    private String authPeriod;

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

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

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

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

/**
 * title: PageElderAuthRecordsDTO 高龄老人认证记录分页查询参数
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 高龄老人认证记录分页查询参数
 *
 * @author txb
 * @date 2021/9/02 11:12
 */
@Data
@ApiModel("高龄老人认证记录分页查询参数")
public class PageElderAuthStatisticDTO {


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

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

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

    @ApiModelProperty(value = "认证期数")
    private String authPeriod;

    @ApiModelProperty(value = "认证状态（1.已认证 2.未认证）")
    private Integer authStatus;

    @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
    private Integer personnelCategory;

    @ApiModelProperty(value = "是否健在（1.是  0.否）")
    private Integer isAlive;

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

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

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

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

/**
 * title: PageElderAuthRecordsDTO 养老认证记录分页查询参数
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 高龄老人认证记录分页查询参数
 *
 * @author lyq
 * @date 2021/9/18 15:12
 */
@Data
@ApiModel("养老认证记录分页查询参数")
public class PagePensionAuthStatisticDTO {


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

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

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

    @ApiModelProperty(value = "认证期数")
    private String authPeriod;

    @ApiModelProperty(value = "认证状态（1.已认证 2.未认证）")
    private Integer authStatus;

    @ApiModelProperty(value = "是否健在（1.是  0.否）")
    private Integer isAlive;

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

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

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

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

/**
 *
 * @author lyq
 * 标记高龄老人认证统计记录请求参数
 */
@Data
@ApiModel("标记高龄老人认证统计记录请求参数")
public class SignElderAuthStatisticDTO {

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

    @ApiModelProperty(value = "标记内容")
    private String mark;

    @ApiModelProperty(value = "操作用户id",hidden = true)
    private Long userId;
}

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

@@ -34,8 +34,11 @@
    @ExcelProperty(value = "认证时间", index = 4)
    private Date authDate;

    @ExcelProperty(value = "健在（是/否）", index = 5)
    private Integer isAlive;
    @ExcelProperty(value = "认证期数", index = 5)
    private String authPeriod;

    @ExcelProperty(value = "标记", index = 6)
    private String mark;

    /**
     * 年龄

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

@@ -32,9 +32,14 @@
    @ExcelProperty(value = "认证时间", index = 4)
    private String authDate;

    @ExcelProperty(value = "健在（是/否）", index = 5)
    private String isAlive;
    @ExcelProperty(value = "认证期数", index = 5)
    private String authPeriod;

    @ExcelProperty(value = "错误信息", index = 6)
    @ExcelProperty(value = "标记", index = 6)
    private String mark;

    @ExcelProperty(value = "错误信息", index = 7)
    private String mistake;


}

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

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

import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
@@ -116,4 +117,10 @@

    @ApiModelProperty(value = "本期未认证人数")
    private Integer authNoAmount;

    @ApiModelProperty(value = "待审核状态id集合列表")
    private List<Long> nextIds;

    @ApiModelProperty(value = "社区id")
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticHeaderVO.java

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

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

/**
 * @author lyq
 * @deprecated 高龄老人认证统计信息
 */
@Data
@ApiModel("高龄老人认证统计信息")
public class ComEldersAuthStatisticHeaderVO {

    @ApiModelProperty(value = "本期总人数")
    private Integer allCount;

    @ApiModelProperty(value = "本期认证成功总人数")
    private Integer yesCount;

    @ApiModelProperty(value = "本期认证失败总人数")
    private Integer noCount;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticVO.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author lyq
 * @deprecated 高龄老人认证统计信息
 */
@Data
@ApiModel("高龄老人认证统计信息")
@EncryptDecryptClass
public class ComEldersAuthStatisticVO {

    @ApiModelProperty(value = "认证记录id")
    private Long id;

    @ApiModelProperty(value = "认证姓名")
    private String name;

    @ApiModelProperty(value = "认证用户手机号")
    private String phone;

    @ApiModelProperty(value = "认证用户身份证")
    @EncryptDecryptField
    private String idCard;

    @ApiModelProperty(value = "性别（1.男 2.女 3.其他）")
    private Integer sex;

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

    @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
    private Integer personnelCategory;

    @ApiModelProperty(value = "是否健在（1.是  0.否）")
    private Integer isAlive;

    @ApiModelProperty(value = "认证期数")
    private String authPeriod;

    @ApiModelProperty(value = "认证时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date authDate;

    @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证 3.线下认证）")
    private Integer authMethod;

    @ApiModelProperty(value = "标记")
    private String mark;

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

    @ApiModelProperty(value = "提交用户id")
    private Long submitUserId;

    @ApiModelProperty(value = "提交用户名称")
    private String submitUserName;

    @ApiModelProperty(value = "审核人名称")
    private String approvalName;

    @ApiModelProperty(value = "现居住地址")
    private String address;

    @ApiModelProperty(value = "认证视频地址")
    private String authVideo;

    @ApiModelProperty(value = "审核状态（1.待审核 2.驳回 3.通过）")
    private Integer approvalStatus;

    @ApiModelProperty(value = "审核人id")
    private Long approverId;

    @ApiModelProperty(value = "审核时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date approvalDate;

    @ApiModelProperty(value = "认证用户生日")
    private String birthday;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComPensionAuthStatisticVO.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author lyq
 * @deprecated 养老认证统计信息
 */
@Data
@ApiModel("养老认证统计信息")
@EncryptDecryptClass
public class ComPensionAuthStatisticVO {

    @ApiModelProperty(value = "认证记录id")
    private Long id;

    @ApiModelProperty(value = "认证姓名")
    private String name;

    @ApiModelProperty(value = "认证用户手机号")
    private String phone;

    @ApiModelProperty(value = "认证用户身份证")
    @EncryptDecryptField
    private String idCard;

    @ApiModelProperty(value = "性别（1.男 2.女 3.其他）")
    private Integer sex;

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

    @ApiModelProperty(value = "是否健在（1.是  0.否）")
    private Integer isAlive;

    @ApiModelProperty(value = "认证期数")
    private String authPeriod;

    @ApiModelProperty(value = "认证时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date authDate;

    @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证 3.线下认证）")
    private Integer authMethod;

    @ApiModelProperty(value = "标记")
    private String mark;

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

    @ApiModelProperty(value = "提交用户id")
    private Long submitUserId;

    @ApiModelProperty(value = "提交用户名称")
    private String submitUserName;

    @ApiModelProperty(value = "审核人名称")
    private String approvalName;

    @ApiModelProperty(value = "现居住地址")
    private String address;

    @ApiModelProperty(value = "认证视频地址")
    private String authVideo;

    @ApiModelProperty(value = "审核状态（1.待审核 2.驳回 3.通过）")
    private Integer approvalStatus;

    @ApiModelProperty(value = "审核人id")
    private Long approverId;

    @ApiModelProperty(value = "审核时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date approvalDate;

    @ApiModelProperty(value = "认证用户生日")
    private String birthday;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

}

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

@@ -5,6 +5,10 @@
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.community.*;
import io.swagger.annotations.ApiOperation;
@@ -3603,14 +3607,14 @@
    R getElderAuthRecordsByIds(@RequestBody List<Long> ids);

    /**
     * 导出高龄认证记录 exportElderAuthRecordsStatistic  导出高龄认证记录
     * 导出高龄认证统计记录 exportElderAuthRecordsStatistic
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/authRecords/statistic/export")
    R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
    R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO);

    /**
     * 分页查询养老金人员认证记录  pagePensionAuthRecords  分页查询养老金人员认证记录
@@ -3841,7 +3845,7 @@
     * @param eldersAuthTypeQueryDTO
     * @return
     */
    @PostMapping("/elders/authtype")
    @PostMapping("/elders/authType")
    R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

    /**
@@ -5693,4 +5697,36 @@
     */
    @PutMapping("/elders/new/authType/{type}")
    R setEldersAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);

    /**
     * 高龄认证统计-分页查询
     * @param pageElderAuthStatisticDTO 请求参数
     * @return  高龄认证统计列表
     */
    @PostMapping("/elders/auth/statistic/page")
    R pageAuthStatisticAdmin(@RequestBody PageElderAuthStatisticDTO pageElderAuthStatisticDTO);

    /**
     * 高龄认证统计-标记
     * @param signElderAuthStatisticDTO 请求参数
     * @return  标记结果
     */
    @PostMapping("/elders/auth/statistic/sign")
    R signAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO);

    /**
     * 高龄认证统计-统计表头数据
     * @param statisticHeaderDTO 请求参数
     * @return  统计表头数据
     */
    @PostMapping("/elders/auth/header/statistic")
    R getAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);

    /**
     * 养老认证统计-分页查询
     * @param pensionAuthStatisticDTO   请求参数
     * @return  养老认证统列表
     */
    @PostMapping("/elders/pension/auth/statistic/page")
    R pagePensionAuthStatisticAdmin(@RequestBody PagePensionAuthStatisticDTO pensionAuthStatisticDTO);
}

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

@@ -1,5 +1,8 @@
package com.panzhihua.common.utlis;

import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.constants.Constants;

import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -117,6 +120,29 @@
        return age - 1;
    }

    /**
     * 根据身份证号判断年龄段
     * @param idCard    身份证号
     * @return  年龄段(1.80-89周岁 2.90-99周岁 3.100周岁（含）以上)
     */
    public static int getAgeCategory(String idCard){
        int nub = -1;
        int age = 0;
        try {
            age = IdcardUtil.getAgeByIdCard(idCard);
        }catch (Exception e){
            return -1;
        }
        if (age >= Constants.EIGHTY && age < Constants.NINETY) {
            nub = 1;
        }else if (age >= Constants.NINETY && age < Constants.ONE_HUNDRED){
            nub = 2;
        }else if (age >= Constants.ONE_HUNDRED){
            nub = 3;
        }
        return nub;
    }

    public static int getAgeFromBirthTimes(long birthTimeLong) {
        Date date = new Date(birthTimeLong * 1000l);
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");

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

@@ -19,7 +19,13 @@
import com.panzhihua.common.listen.ComMngPopulationDrugExcelListen;
import com.panzhihua.common.listen.ComPensionAuthRecordImportExcelListen;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.elders.ComEldersAuthStatisticHeaderVO;
import com.panzhihua.common.model.vos.elders.ComEldersAuthStatisticVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.*;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
@@ -275,6 +281,7 @@
    @ApiOperation(value = "高龄认证-高龄认证审核---")
    @PostMapping("/authRecords/examine")
    public R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO) {
        comElderAuthRecordVO.setApproverId(this.getUserId());
        return communityService.examineElderAuthRecords(comElderAuthRecordVO);
    }

@@ -476,7 +483,7 @@

    @ApiOperation(value = "高龄认证统计-导出高龄认证统计---")
    @PostMapping(value = "/authRecords/statistic/export")
    public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
    public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO) {
        Long communityId = this.getLoginUserInfo().getCommunityId();
        pageElderAuthRecordsDTO.setCommunityId(communityId);
        String ftpUrl = "/mnt/data/web/excel/";
@@ -528,12 +535,6 @@
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }

    @ApiOperation(value = "高龄认证统计-表头统计---")
    @PostMapping(value = "/header/statistic/")
    public R getElderHeaderStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
        return R.ok();
    }

    /**
@@ -882,9 +883,11 @@
        List<String> head3 = new ArrayList<String>();
        head3.add("现居住地址");
        List<String> head4 = new ArrayList<String>();
        head4.add("认证时间(年-月-日)");
        head4.add("认证时间(年/月/日 如：2021/1/1)");
        List<String> head5 = new ArrayList<String>();
        head5.add("健在（是/否）");
        head5.add("认证期数(年月 注：月份小于10，需要在月数前加0 如：202101)");
        List<String> head6 = new ArrayList<String>();
        head6.add("标记（备注信息）");

        list.add(head0);
        list.add(head1);
@@ -892,6 +895,37 @@
        list.add(head3);
        list.add(head4);
        list.add(head5);
        list.add(head6);
        return list;
    }

    @ApiOperation(value = "高龄认证统计-分页查询高龄老人认证统计记录---",response = ComEldersAuthStatisticVO.class)
    @PostMapping("/auth/statistic/page")
    public R pageAuthStatisticAdmin(@RequestBody PageElderAuthStatisticDTO pageElderAuthStatisticDTO) {
        Long communityId = this.getLoginUserInfo().getCommunityId();
        pageElderAuthStatisticDTO.setCommunityId(communityId);
        return communityService.pageAuthStatisticAdmin(pageElderAuthStatisticDTO);
    }

    @ApiOperation(value = "高龄认证统计-标记高龄老人认证统计记录---")
    @PostMapping("/auth/statistic/sign")
    public R signAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO) {
        signElderAuthStatisticDTO.setUserId(this.getUserId());
        return communityService.signAuthStatisticAdmin(signElderAuthStatisticDTO);
    }

    @ApiOperation(value = "高龄认证统计-表头统计---",response = ComEldersAuthStatisticHeaderVO.class)
    @PostMapping(value = "/auth/header/statistic")
    public R getAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO) {
        statisticHeaderDTO.setCommunityId(this.getCommunityId());
        return communityService.getAuthHeaderStatisticAdmin(statisticHeaderDTO);
    }

    @ApiOperation(value = "养老认证统计-分页查询养老认证统计记录---",response = ComEldersAuthStatisticVO.class)
    @PostMapping("/pensionAuthRecords/statistic/page")
    public R pagePensionAuthStatisticAdmin(@RequestBody PagePensionAuthStatisticDTO pensionAuthStatisticDTO) {
        Long communityId = this.getLoginUserInfo().getCommunityId();
        pensionAuthStatisticDTO.setCommunityId(communityId);
        return communityService.pagePensionAuthStatisticAdmin(pensionAuthStatisticDTO);
    }
}

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

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

import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
import com.panzhihua.service_community.service.*;
@@ -49,6 +53,8 @@
    private ComElderAuthRecordsService comElderAuthRecordsService;
    @Resource
    private ComPensionAuthRecordService comPensionAuthRecordService;
    @Resource
    private ComPensionAuthHistoryRecordService comPensionAuthHistoryRecordService;

    @PostMapping("/getAuth")
    public R getAuth(@RequestParam("authUserId") Long authUserId) {
@@ -166,7 +172,7 @@
     * @param eldersAuthTypeQueryDTO
     * @return
     */
    @PostMapping("/authtype")
    @PostMapping("/authType")
    public R elderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
        return eldersAuthService.communityAuthType(eldersAuthTypeQueryDTO);
    }
@@ -291,7 +297,7 @@
     * @date 2021/9/02 11:03
     */
    @PostMapping("/authRecords/statistic/export")
    public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO){
    public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO){
        return comElderAuthRecordsService.exportElderAuthRecordsStatistic(pageElderAuthRecordsDTO);
    }

@@ -451,5 +457,44 @@
        return eldersAuthService.getAuthType(eldersAuthTypeQueryDTO);
    }

    /**
     * 高龄认证统计-分页查询
     * @param pageElderAuthStatisticDTO 请求参数
     * @return  高龄认证统计列表
     */
    @PostMapping("/auth/statistic/page")
    public R pageAuthStatisticAdmin(@RequestBody PageElderAuthStatisticDTO pageElderAuthStatisticDTO) {
        return eldersAuthService.pageAuthStatisticAdmin(pageElderAuthStatisticDTO);
    }

    /**
     * 高龄认证统计-标记
     * @param signElderAuthStatisticDTO 请求参数
     * @return  标记结果
     */
    @PostMapping("/auth/statistic/sign")
    public R signAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO) {
        return eldersAuthService.signAuthStatisticAdmin(signElderAuthStatisticDTO);
    }

    /**
     * 高龄认证统计-统计表头数据
     * @param statisticHeaderDTO 请求参数
     * @return  统计表头数据
     */
    @PostMapping("/auth/header/statistic")
    public R getAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO) {
        return eldersAuthService.getAuthHeaderStatisticAdmin(statisticHeaderDTO);
    }

    /**
     * 养老认证统计-分页查询
     * @param pensionAuthStatisticDTO   请求参数
     * @return  养老认证统列表
     */
    @PostMapping("/pension/auth/statistic/page")
    public R pagePensionAuthStatisticAdmin(@RequestBody PagePensionAuthStatisticDTO pensionAuthStatisticDTO) {
        return comPensionAuthHistoryRecordService.pagePensionAuthStatisticAdmin(pensionAuthStatisticDTO);
    }

}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordExcleVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordStatisticExcleVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
@@ -36,6 +37,13 @@

    void updateAll(@Param("comElderAuthRecordsDOS") List<ComElderAuthRecordsDO> comElderAuthRecordsDOS);

    List<ComElderAuthRecordStatisticExcleVO> exportElderAuthRecordsStatistic(@Param("pageElderAuthRecordsDTO") PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
    List<ComElderAuthRecordStatisticExcleVO> exportElderAuthRecordsStatistic(@Param("pageElderAuthRecordsDTO") PageElderAuthStatisticDTO pageElderAuthRecordsDTO);

    /**
     * 查询社区待审核高龄认证记录id集合
     * @param communityId   社区id
     * @param authRecordId   需要排除的详情id
     * @return  待审核高龄认证记录id集合
     */
    List<Long> getNextIds(@Param("communityId") Long communityId,@Param("authRecordId") Long authRecordId);
}

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

@@ -1,5 +1,9 @@
package com.panzhihua.service_community.dao;

import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.elders.ComEldersAuthStatisticHeaderVO;
import com.panzhihua.common.model.vos.elders.ComEldersAuthStatisticVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -30,4 +34,14 @@
    IPage<ComEldersAuthHistoryRecordVO> findByPage(Page page,
        @Param("pageComEldersAuthHistoryRecordDTO") PageComEldersAuthHistoryRecordDTO pageComEldersAuthHistoryRecordDTO);

    /**
     * 高龄认证统计-分页查询
     * @param pageElderAuthStatisticDTO 请求参数
     * @return  高龄认证统计列表
     */
    IPage<ComEldersAuthStatisticVO> pageAuthStatisticAdmin(Page page,
                                               @Param("pageElderAuthStatisticDTO") PageElderAuthStatisticDTO pageElderAuthStatisticDTO);

    ComEldersAuthStatisticHeaderVO getAuthHeaderStatisticAdmin(@Param("statisticHeaderDTO") ElderAuthStatisticHeaderDTO statisticHeaderDTO);

}

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

New file
@@ -0,0 +1,23 @@
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.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.vos.elders.ComPensionAuthStatisticVO;
import com.panzhihua.service_community.model.dos.ComPensionAuthHistoryRecordDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @author lyq
 * @date  2021-09-18 15:07:12
 * @deprecated   养老认证历史记录表mapper类
 */
@Mapper
public interface ComPensionAuthHistoryRecordMapper extends BaseMapper<ComPensionAuthHistoryRecordDO> {

    IPage<ComPensionAuthStatisticVO> pageAuthStatisticAdmin(Page page,
                                                            @Param("pensionAuthStatisticDTO") PagePensionAuthStatisticDTO pensionAuthStatisticDTO);

}

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

@@ -62,9 +62,9 @@
    private String idCard;

    /**
    * 性别
    * 性别（1.男 2.女 3.其他）
    */
    private String sex;
    private Integer sex;

    /**
    * 年龄

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

@@ -68,4 +68,76 @@
     */
    private Long communityId;

    /**
     * 高龄人口id
     */
    private Long elderliesId;

    /**
     * 认证期数
     */
    private String authPeriod;

    /**
     * 提交用户id
     */
    private Long submitUserId;

    /**
     * 认证方式（1.视频认证 2.人脸认证 3.线下认证）
     */
    private Integer authMethod;

    /**
     * 人脸核验结果数据
     */
    private String verificationResult;

    /**
     * 标记
     */
    private String mark;

    /**
     * 是否健在
     */
    private Integer isAlive;

    /**
     * 人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）
     */
    private Integer personnelCategory;

    /**
     * 性别（1.男 2.女 3.其他）
     */
    private Integer sex;

    /**
     * 手机号
     */
    private String phone;

    /**
     * 认证时间
     */
    private Date authDate;

    /**
     * 审核时间
     */
    private Date approvalDate;

    /**
     * 审核id
     */
    private Long approverId;

    /**
     * 本月是否已认证（1.是 2.否）
     */
    public interface isAuth{
        int yes = 1;
        int no = 2;
    }
}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

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


/**
 * @author  lyq
 * @date  2021-09-18 15:07:12
 * @deprecated  养老认证历史记录表实体类
 */

@Data
@TableName("com_pension_auth_history_record")
public class ComPensionAuthHistoryRecordDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 老人用户id
     */
    private Long userId;

    /**
     * 名称
     */
    private String name;

    /**
     * 身份证号码
     */
    private String idCard;

    /**
     * 出生年月
     */
    private String brithday;

    /**
     * 年龄
     */
    private Integer age;

    /**
     * 户籍地
     */
    private String domicile;

    /**
     * 本月是否已认证（1.是 2.否）
     */
    private Integer isAuth;

    /**
     * 创建时间
     */
    private Date createAt;

    /**
     * 社区id
     */
    private Long communityId;

    /**
     * 养老人口id
     */
    private Long elderliesId;

    /**
     * 认证期数
     */
    private String authPeriod;

    /**
     * 提交用户id
     */
    private Long submitUserId;

    /**
     * 认证方式（1.视频认证 2.人脸认证 3.线下认证）
     */
    private Integer authMethod;

    /**
     * 人脸核验结果数据
     */
    private String verificationResult;

    /**
     * 标记
     */
    private String mark;

    /**
     * 是否健在（1.是  0.否）
     */
    private Integer isAlive;

    /**
     * 性别（1.男 2.女 3.其他）
     */
    private Integer sex;

    /**
     * 认证成功记录id
     */
    private Long authId;

    /**
     * 联系电话
     */
    private String phone;

    /**
     * 认证时间
     */
    private Date authDate;

    /**
     * 审核时间
     */
    private Date approvalDate;

    /**
     * 审核人员id
     */
    private Long approverId;

    @Override
    public String toString() {
        return "ComPensionAuthHistoryRecordDO{" +
                "id=" + id +
                ", userId=" + userId +
                ", name=" + name +
                ", idCard=" + idCard +
                ", brithday=" + brithday +
                ", age=" + age +
                ", domicile=" + domicile +
                ", isAuth=" + isAuth +
                ", createAt=" + createAt +
                ", communityId=" + communityId +
                ", elderliesId=" + elderliesId +
                ", authPeriod=" + authPeriod +
                ", submitUserId=" + submitUserId +
                ", authMethod=" + authMethod +
                ", verificationResult=" + verificationResult +
                ", mark=" + mark +
                ", isAlive=" + isAlive +
                ", sex=" + sex +
                ", authId=" + authId +
                ", phone=" + phone +
                ", authDate=" + authDate +
                ", approvalDate=" + approvalDate +
                ", approverId=" + approverId +
                "}";
    }
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
@@ -87,7 +88,7 @@
     * @author txb
     * @date 2021/9/02 11:03
     */
    R exportElderAuthRecordsStatistic(PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
    R exportElderAuthRecordsStatistic(PageElderAuthStatisticDTO pageElderAuthRecordsDTO);

    /**
     * 定时任务每月1号0点统计高龄老人本期应该认证总人数

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

New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComPensionAuthHistoryRecordDO;

/**
 * @author lyq
 * @date  2021-09-18 15:07:12
 * @deprecated  养老认证历史记录表服务类
 */
public interface ComPensionAuthHistoryRecordService extends IService<ComPensionAuthHistoryRecordDO> {

    /**
     * 养老认证统计-分页查询
     * @param pensionAuthStatisticDTO   请求参数
     * @return  养老认证统列表
     */
    R pagePensionAuthStatisticAdmin(PagePensionAuthStatisticDTO pensionAuthStatisticDTO);

}

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

@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -192,4 +195,25 @@
     */
    R getAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

    /**
     * 高龄认证统计-分页查询
     * @param pageElderAuthStatisticDTO 请求参数
     * @return  高龄认证统计列表
     */
    R pageAuthStatisticAdmin(PageElderAuthStatisticDTO pageElderAuthStatisticDTO);

    /**
     * 高龄认证统计-标记
     * @param signElderAuthStatisticDTO 请求参数
     * @return  标记结果
     */
    R signAuthStatisticAdmin(SignElderAuthStatisticDTO signElderAuthStatisticDTO);

    /**
     * 高龄认证统计-统计表头数据
     * @param statisticHeaderDTO 请求参数
     * @return  统计表头数据
     */
    R getAuthHeaderStatisticAdmin(ElderAuthStatisticHeaderDTO statisticHeaderDTO);

}

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

@@ -6,8 +6,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Joiner;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.enums.*;
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
@@ -50,6 +52,8 @@
    @Resource
    private ComElderAuthRecordsService comElderAuthRecordsService;
    @Resource
    private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper;
@@ -83,6 +87,7 @@
    @Override
    public R detailElderAuthRecords(Long authRecordId) {
        ComElderAuthRecordVO comElderAuthRecordVO = comElderAuthRecordsDAO.detailElderAuthRecords(authRecordId);
        comElderAuthRecordVO.setNextIds(comElderAuthRecordsDAO.getNextIds(comElderAuthRecordVO.getCommunityId(),authRecordId));
        return R.ok(comElderAuthRecordVO);
    }

@@ -92,11 +97,21 @@
        if (comElderAuthRecordsDO == null) {
            return R.fail("未查询到高龄老人认证记录");
        }
        BeanUtils.copyProperties(comElderAuthRecordVO, comElderAuthRecordsDO);
        if (comElderAuthRecordVO.getApprovalStatus().equals(3)) {
            comElderAuthRecordsDO.setAuthStatus(1);
        if(!comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.dsh)){
            return R.fail("该记录已审核，不可重复审核");
        }
        comElderAuthRecordsDO.setApprovalDate(new Date());
        ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(comElderAuthRecordsDO.getElderliesId());
        if(authElderliesDO == null){
            return R.fail("未查询到老人信息");
        }

        Date nowDate = new Date();
        BeanUtils.copyProperties(comElderAuthRecordVO, comElderAuthRecordsDO);
        comElderAuthRecordsDO.setApprovalDate(nowDate);
        if (comElderAuthRecordVO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) {
            comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
        }

        int nub = comElderAuthRecordsDAO.updateById(comElderAuthRecordsDO);
        if (nub < 1) {
            return R.fail("审核失败");
@@ -139,6 +154,7 @@
        // 需要修改的认证记录集合
        List<ComElderAuthRecordsDO> updateList = new ArrayList<>();
        log.info("开始处理导入数据");

        List<ComElderAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>();
        try {
            // 查询所有人口数据放入HashMap中
@@ -148,9 +164,8 @@
                String key = population.getCardNo();
                populationMap.put(key, population);
            });

            Date nowDate = new Date();
            for (ComElderAuthRecordImportExcelVO vo : list) {
                String cardNoAES = AESUtil.encrypt128(vo.getIdCard(), aesKey);
                // 判断实有人口是否已存在
                log.info("开始查询实有人口是否已存在");
                ComMngPopulationDO populationDO = null;
@@ -164,7 +179,6 @@
                    if (null == comElderAuthElderliesDO) {
                        ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
                        BeanUtils.copyProperties(vo, mistake);
                        setMistake(mistake, vo);
                        mistake.setMistake("该实有人口已存在，但本社区不存在高龄老人信息，请先导入高龄老人");
                        mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format));
                        mistakes.add(mistake);
@@ -175,25 +189,15 @@
                            if (age < 80 || !comElderAuthElderliesDO.getIsRegister().equals(1) || !comElderAuthElderliesDO.getIsAlive().equals(1)) {
                                ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
                                BeanUtils.copyProperties(vo, mistake);
                                setMistake(mistake, vo);
                                mistake.setMistake("该人口未满80岁，或者不健在，或者未做高龄老人登记");
                                mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format));
                                mistakes.add(mistake);
                            }else {

                                //满足认证条件，判断是否存在当期认证记录
                                List<ComElderAuthRecordsDO> elderAuthRecordList = null;
                                ComElderAuthRecordsDO comElderAuthRecordsDO = null;
                                Date nowDate = new Date();
                                // 获取当前年
                                int year = DateUtils.getYear(nowDate);
                                // 获取当前月
                                int month = DateUtils.getMonth(nowDate) + 1;
                                String authPeriod = "";
                                if (month < 10) {
                                    authPeriod = String.valueOf(year) + "0" + String.valueOf(month);
                                }else {
                                    authPeriod = String.valueOf(year) +  String.valueOf(month);
                                }
                                String authPeriod = vo.getAuthPeriod();
                                elderAuthRecordList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda()
                                        .eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId())
                                        .eq(ComElderAuthRecordsDO::getAuthPeriod, authPeriod).orderByDesc(ComElderAuthRecordsDO::getCreateAt));
@@ -203,27 +207,20 @@
                                    if (comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) {
                                        ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
                                        BeanUtils.copyProperties(vo, mistake);
                                        setMistake(mistake, vo);
                                        mistake.setMistake("该人口本期已认证通过，不能重复认证");
                                        mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format));
                                        mistakes.add(mistake);
                                    }else if (comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.dsh)) {
                                        comElderAuthRecordsDO.setSubmitUserId(userId);
                                        comElderAuthRecordsDO.setApproverId(userId);
                                        comElderAuthRecordsDO.setCommunityId(communityId);
                                        comElderAuthRecordsDO.setApprovalStatus(ComElderAuthRecordsDO.approvalStatus.tg);
                                        comElderAuthRecordsDO.setApprovalDate(new Date());
                                        comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
                                        comElderAuthRecordsDO.setAuthMethod(ComElderAuthRecordsDO.authMethod.xxrz);
                                        comElderAuthRecordsDO = updateElderAuthRecordsDO(vo, comElderAuthRecordsDO,userId,communityId,nowDate);
                                        updateList.add(comElderAuthRecordsDO);
                                    }else {
                                        // 驳回状态,则新增
                                        comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId);
                                        comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate);
                                        saveList.add(comElderAuthRecordsDO);
                                    }
                                }else {
                                    // 不存在记录,则新增
                                    comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId);
                                    comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate);
                                    saveList.add(comElderAuthRecordsDO);
                                }
                            }
@@ -233,7 +230,6 @@
                    // 不存在实有人口,则新增
                    ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
                    BeanUtils.copyProperties(vo, mistake);
                    setMistake(mistake, vo);
                    mistake.setMistake("不存在该实有人口，请先导入实有人口信息");
                    mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format));
                    mistakes.add(mistake);
@@ -266,7 +262,7 @@
    }

    @Override
    public R exportElderAuthRecordsStatistic(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
    public R exportElderAuthRecordsStatistic(PageElderAuthStatisticDTO pageElderAuthRecordsDTO) {
        List<ComElderAuthRecordStatisticExcleVO> comElderAuthRecordStatisticExcleVOS = comElderAuthRecordsDAO.exportElderAuthRecordsStatistic(pageElderAuthRecordsDTO);
        if (null != comElderAuthRecordStatisticExcleVOS && comElderAuthRecordStatisticExcleVOS.size() > 0) {
            comElderAuthRecordStatisticExcleVOS.forEach(comElderAuthRecordStatisticExcleVO -> {
@@ -319,20 +315,21 @@
    }

    private ComElderAuthRecordsDO updateElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo
            , ComElderAuthRecordsDO comElderAuthRecordsDO, Long userId, Long communityId) {
            , ComElderAuthRecordsDO comElderAuthRecordsDO, Long userId, Long communityId,Date date) {
        BeanUtils.copyProperties(vo, comElderAuthRecordsDO);
        comElderAuthRecordsDO.setSubmitUserId(userId);
        comElderAuthRecordsDO.setApproverId(userId);
        comElderAuthRecordsDO.setApprovalStatus(ComElderAuthRecordsDO.approvalStatus.tg);
        comElderAuthRecordsDO.setApprovalDate(new Date());
        comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
        comElderAuthRecordsDO.setCommunityId(communityId);
        comElderAuthRecordsDO.setApprovalStatus(ComElderAuthRecordsDO.approvalStatus.tg);
        comElderAuthRecordsDO.setApprovalDate(date);
        comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
        comElderAuthRecordsDO.setAuthMethod(ComElderAuthRecordsDO.authMethod.xxrz);
        comElderAuthRecordsDO.setMark(vo.getMark());
        return comElderAuthRecordsDO;
    }

    private ComElderAuthRecordsDO saveElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo
            ,  ComElderAuthElderliesDO comElderAuthElderliesDO, String authPeriod, Long userId, Long communityId) {
            ,  ComElderAuthElderliesDO comElderAuthElderliesDO, String authPeriod, Long userId, Long communityId,Date date) {
        ComElderAuthRecordsDO comElderAuthRecordsDO = new ComElderAuthRecordsDO();
        BeanUtils.copyProperties(vo, comElderAuthRecordsDO);
        comElderAuthRecordsDO.setId(Snowflake.getId());
@@ -341,18 +338,14 @@
        comElderAuthRecordsDO.setSubmitUserId(userId);
        comElderAuthRecordsDO.setApproverId(userId);
        comElderAuthRecordsDO.setApprovalStatus(ComElderAuthRecordsDO.approvalStatus.tg);
        comElderAuthRecordsDO.setApprovalDate(new Date());
        comElderAuthRecordsDO.setApprovalDate(date);
        comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
        comElderAuthRecordsDO.setCommunityId(communityId);
        comElderAuthRecordsDO.setAuthMethod(ComElderAuthRecordsDO.authMethod.xxrz);
        comElderAuthRecordsDO.setMark(vo.getMark());
        comElderAuthRecordsDO.setCreateAt(date);
        return comElderAuthRecordsDO;
    }

    private void setMistake(ComElderAuthRecordImportMistakeExcelVO mvo,
                                   ComElderAuthRecordImportExcelVO vo) {
        mvo.setIsAlive(PopulHouseUseEnum.getCnDescByName(vo.getIsAlive()));
    }


    /**
     * 判重方法

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

New file
@@ -0,0 +1,31 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComPensionAuthHistoryRecordMapper;
import com.panzhihua.service_community.model.dos.ComPensionAuthHistoryRecordDO;
import com.panzhihua.service_community.service.ComPensionAuthHistoryRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @author lyq
 * @date  2021-09-18 15:07:12
 * @deprecated  养老认证历史记录表服务实现类
 */
@Slf4j
@Service
public class ComPensionAuthHistoryRecordServiceImpl extends ServiceImpl<ComPensionAuthHistoryRecordMapper, ComPensionAuthHistoryRecordDO> implements ComPensionAuthHistoryRecordService {

    /**
     * 养老认证统计-分页查询
     * @param pensionAuthStatisticDTO   请求参数
     * @return  养老认证统列表
     */
    @Override
    public R pagePensionAuthStatisticAdmin(PagePensionAuthStatisticDTO pensionAuthStatisticDTO){
        return R.ok(this.baseMapper.pageAuthStatisticAdmin(new Page(pensionAuthStatisticDTO.getPageNum(),pensionAuthStatisticDTO.getPageSize()),pensionAuthStatisticDTO));
    }
}

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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.elders.ComEldersAuthHistoryVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -251,10 +254,10 @@
    public R communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
        Long communityId = eldersAuthTypeQueryDTO.getCommunityId();
        List<SysConfDO> confDOList = sysConfDao.selectList(new LambdaQueryWrapper<SysConfDO>()
            .eq(SysConfDO::getCommunityId, communityId).eq(SysConfDO::getCode,"ELDER_AUTH_TYPE").orderByDesc(SysConfDO::getCreateAt));
            .eq(SysConfDO::getCommunityId, communityId).eq(SysConfDO::getCode,"ELDER_AUTH_TYPE_" + communityId).orderByDesc(SysConfDO::getCreateAt));
        if (confDOList == null || confDOList.size() == 0) {
            SysConfDO sysConfDO = new SysConfDO();
            sysConfDO.setCode("ELDER_AUTH_TYPE");
            sysConfDO.setCode("ELDER_AUTH_TYPE_" + communityId);
            sysConfDO.setName("高龄认证类型");
            sysConfDO.setValue(2 + "");// 核验类型（1.视频认证 2.人脸核验）
            sysConfDO.setDescription("高龄认证默认添加的核验类型");
@@ -641,4 +644,42 @@
        }
        return R.ok();
    }

    /**
     * 高龄认证统计-分页查询
     * @param pageElderAuthStatisticDTO 请求参数
     * @return  高龄认证统计列表
     */
    @Override
    public R pageAuthStatisticAdmin(PageElderAuthStatisticDTO pageElderAuthStatisticDTO){
        return R.ok(comEldersAuthHistoryRecordMapper.pageAuthStatisticAdmin(new Page(pageElderAuthStatisticDTO.getPageNum(),pageElderAuthStatisticDTO.getPageSize()),pageElderAuthStatisticDTO));
    }

    /**
     * 高龄认证统计-标记
     * @param signElderAuthStatisticDTO 请求参数
     * @return  标记结果
     */
    @Override
    public R signAuthStatisticAdmin(SignElderAuthStatisticDTO signElderAuthStatisticDTO){
        ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectById(signElderAuthStatisticDTO.getId());
        if(authHistoryRecordDO == null){
            return R.fail("未查询到该记录");
        }
        authHistoryRecordDO.setMark(signElderAuthStatisticDTO.getMark());
        if(comEldersAuthHistoryRecordMapper.updateById(authHistoryRecordDO) > 0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 高龄认证统计-统计表头数据
     * @param statisticHeaderDTO 请求参数
     * @return  统计表头数据
     */
    @Override
    public R getAuthHeaderStatisticAdmin(ElderAuthStatisticHeaderDTO statisticHeaderDTO){
        return R.ok(comEldersAuthHistoryRecordMapper.getAuthHeaderStatisticAdmin(statisticHeaderDTO));
    }
}

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

@@ -18,11 +18,12 @@
                <result column="auth_date" property="authDate" />
                <result column="create_at" property="createAt" />
                <result column="update_at" property="updateAt" />
                <result column="community_id" property="communityId" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, elderlies_id, auth_method, auth_period, submit_user_id, auth_video, approver, approval_status, approval_date, mark, reject_reason, auth_status, auth_date, create_at, update_at
        id, elderlies_id, auth_method, auth_period, submit_user_id, auth_video, approver, approval_status, approval_date, mark, reject_reason, auth_status, auth_date, create_at, update_at, community_id
    </sql>

    <select id="pageElderAuthRecords" resultType="com.panzhihua.common.model.vos.community.ComElderAuthRecordVO">
@@ -89,6 +90,7 @@
        SELECT
            su.`name` submitUserName,
            ceae.phone,
            cear.id,
            ceae.`name`,
            ceae.id_card,
            ceae.sex,
@@ -102,6 +104,7 @@
            cear.mark,
            cear.auth_video,
            cear.approval_status,
            cear.community_id,
            su1.`name` as approverName,
            cear.approval_date
        FROM
@@ -169,11 +172,15 @@
            com_elder_auth_records cear
                LEFT JOIN com_elder_auth_elderlies ceae ON cear.elderlies_id = ceae.id
                LEFT JOIN sys_user su ON cear.submit_user_id = su.user_id
        WHERE
            cear.id in
        <foreach collection="ids" item="id" open="(" separator="," close=")" >
            #{id}
        </foreach>
            <where>
                <if test="ids != null and ids.size > 0">
                    and cear.id in
                    <foreach collection="ids" item="id" open="(" separator="," close=")" >
                        #{id}
                    </foreach>
                </if>
            </where>

        order by cear.create_at desc
    </select>

@@ -237,60 +244,62 @@
        ceae.`name`,
        ceae.id_card,
        CASE
            ceae.sex
            WHEN 1 THEN
            '男'
            WHEN 2 THEN
            '女'
            WHEN 3 THEN
            '其他'
        ceae.sex
        WHEN 1 THEN
        '男'
        WHEN 2 THEN
        '女'
        WHEN 3 THEN
        '其他'
        END sex,
        ceae.birthday,
        CASE
            ceae.personnel_category
            WHEN 1 THEN
            '80-89周岁'
            WHEN 2 THEN
            '90-99周岁'
            WHEN 3 THEN
            '100周岁（含）以上'
        ceae.personnel_category
        WHEN 1 THEN
        '80-89周岁'
        WHEN 2 THEN
        '90-99周岁'
        WHEN 3 THEN
        '100周岁（含）以上'
        END personnelCategory,
        ceae.address,
        CASE
            ceae.is_alive
            WHEN 1 THEN
            '是'
            WHEN 0 THEN
            '否'
        ceae.is_alive
        WHEN 1 THEN
        '是'
        WHEN 0 THEN
        '否'
        END is_alive,
        cear.auth_period,
        cear.auth_date,
        ceahr.auth_period,
        ceahr.auth_date,
        CASE
            cear.auth_method
            WHEN 1 THEN
            '视频认证'
            WHEN 2 THEN
            '人脸认证'
        ceahr.auth_method
        WHEN 1 THEN
        '视频认证'
        WHEN 2 THEN
        '人脸认证'
        WHEN 3 THEN
        '线下认证'
        END authMethod,
        cear.mark,
        ceahr.mark,
        CASE
            cear.auth_status
            WHEN 1 THEN
            '已认证'
            WHEN 0 THEN
            '未认证'
        ceahr.is_auth
        WHEN 1 THEN
        '已认证'
        WHEN 2 THEN
        '未认证'
        END authStatus
        FROM
        com_elder_auth_records cear
        LEFT JOIN com_elder_auth_elderlies ceae ON cear.elderlies_id = ceae.id
        LEFT JOIN sys_user su ON cear.submit_user_id = su.user_id
        com_elders_auth_history_record ceahr
        LEFT JOIN com_elder_auth_elderlies ceae ON ceahr.elderlies_id = ceae.id
        LEFT JOIN sys_user su ON ceahr.submit_user_id = su.user_id
        WHERE
        ceae.community_id = #{pageElderAuthRecordsDTO.communityId}
        ceahr.community_id = #{pageElderAuthRecordsDTO.communityId}
        <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''">
            and cear.auth_period = #{pageElderAuthRecordsDTO.authPeriod}
            and ceahr.auth_period = #{pageElderAuthRecordsDTO.authPeriod}
        </if>
        <if test="pageElderAuthRecordsDTO.authStatus != null and pageElderAuthRecordsDTO.authStatus != 0">
            and cear.auth_status = #{pageElderAuthRecordsDTO.authStatus}
            and ceahr.is_auth = #{pageElderAuthRecordsDTO.authStatus}
        </if>
        <if test="pageElderAuthRecordsDTO.personnelCategory != null and pageElderAuthRecordsDTO.personnelCategory != 0">
            and ceae.personnel_category = #{pageElderAuthRecordsDTO.personnelCategory}
@@ -298,10 +307,14 @@
        <if test="pageElderAuthRecordsDTO.isAlive != null and pageElderAuthRecordsDTO.isAlive != 0">
            and ceae.is_alive = #{pageElderAuthRecordsDTO.isAlive}
        </if>
        <if test="pageElderAuthRecordsDTO.searchKey != null and pageElderAuthRecordsDTO.searchKey != ''">
            and (ceae.`name` like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%')
            or  cear.mark like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%'))
        <if test="pageElderAuthRecordsDTO.keyWord != null and pageElderAuthRecordsDTO.keyWord != ''">
            and (ceae.`name` like concat ('%', #{pageElderAuthRecordsDTO.keyWord}, '%')
            or  ceahr.mark like concat ('%', #{pageElderAuthRecordsDTO.keyWord}, '%'))
        </if>
        order by cear.create_at desc
        order by ceahr.create_at desc
    </select>

    <select id="getNextIds" resultType="long">
        select id from com_elder_auth_records where approval_status = 1 and community_id = #{communityId} and id != #{authRecordId}
    </select>
</mapper>

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

@@ -64,4 +64,92 @@
        </if>
    </select>

    <select id="pageAuthStatisticAdmin" parameterType="com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO"
            resultType="com.panzhihua.common.model.vos.elders.ComEldersAuthStatisticVO">
        SELECT
            ceahr.id,
            ceahr.phone,
            ceahr.`name`,
            ceahr.id_card,
            ceahr.sex,
            ceahr.age,
            ceahr.personnel_category,
            ceahr.is_alive,
            ceahr.auth_period,
            ceahr.auth_date,
            ceahr.auth_method,
            ceahr.mark,
            ceahr.is_auth,
            ceahr.submit_user_id,
            IFNULL(su.nick_name,su.`name`) as submitUserName,
            IFNULL(su1.nick_name,su1.`name`) as approvalName,
            ceae.address,
            cear.auth_video,
            cear.approval_status,
            ceahr.approver_id,
            ceahr.approval_date,
            ceahr.brithday
        FROM
            com_elders_auth_history_record AS ceahr
            LEFT JOIN com_elder_auth_elderlies AS ceae ON ceae.id = ceahr.elderlies_id
            left join sys_user as su on su.user_id = ceahr.submit_user_id
            left join sys_user as su1 on su1.user_id = ceahr.approver_id
            left join com_elder_auth_records as cear on cear.id = ceahr.auth_id
        <where>
            <if test="pageElderAuthStatisticDTO.keyWord != null and pageElderAuthStatisticDTO.keyWord !=&quot;&quot;">
                and (ceahr.`name` like concat (#{pageElderAuthStatisticDTO.keyWord},'%') or
                ceahr.id_card = #{pageElderAuthStatisticDTO.keyWord} or
                ceahr.mark like concat (#{pageElderAuthStatisticDTO.keyWord},'%'))
            </if>
            <if test="pageElderAuthStatisticDTO.authPeriod != null and pageElderAuthStatisticDTO.authPeriod != &quot;&quot;">
                and ceahr.auth_period = #{pageElderAuthStatisticDTO.authPeriod}
            </if>
            <if test="pageElderAuthStatisticDTO.authStatus != null">
                and ceahr.is_auth = #{pageElderAuthStatisticDTO.authStatus}
            </if>
            <if test="pageElderAuthStatisticDTO.personnelCategory != null">
                and ceahr.personnel_category = #{pageElderAuthStatisticDTO.personnelCategory}
            </if>
            <if test="pageElderAuthStatisticDTO.isAlive != null">
                and ceahr.is_alive = #{pageElderAuthStatisticDTO.isAlive}
            </if>
            <if test="pageElderAuthStatisticDTO.communityId != null">
                and ceahr.community_id = #{pageElderAuthStatisticDTO.communityId}
            </if>
        </where>
        order by ceahr.create_at desc
    </select>

    <select id="getAuthHeaderStatisticAdmin" parameterType="com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO"
            resultType="com.panzhihua.common.model.vos.elders.ComEldersAuthStatisticHeaderVO">
        SELECT
            count( id ) AS allCount,
            ( SELECT count( id ) FROM com_elders_auth_history_record WHERE  is_auth = 1
            <if test="statisticHeaderDTO.authPeriod != null and statisticHeaderDTO.authPeriod != &quot;&quot;">
                and auth_period = #{statisticHeaderDTO.authPeriod}
            </if>
            <if test="statisticHeaderDTO.communityId != null">
                and community_id = #{statisticHeaderDTO.communityId}
            </if>
            ) AS yesCount,
            ( SELECT count( id ) FROM com_elders_auth_history_record WHERE  is_auth = 2
            <if test="statisticHeaderDTO.authPeriod != null and statisticHeaderDTO.authPeriod != &quot;&quot;">
                and auth_period = #{statisticHeaderDTO.authPeriod}
            </if>
            <if test="statisticHeaderDTO.communityId != null">
                and community_id = #{statisticHeaderDTO.communityId}
            </if>
            ) AS noCount
        FROM
            com_elders_auth_history_record
        <where>
            <if test="statisticHeaderDTO.authPeriod != null and statisticHeaderDTO.authPeriod != &quot;&quot;">
                and auth_period = #{statisticHeaderDTO.authPeriod}
            </if>
            <if test="statisticHeaderDTO.communityId != null">
                and community_id = #{statisticHeaderDTO.communityId}
            </if>
        </where>
    </select>

</mapper>

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

New file
@@ -0,0 +1,88 @@
<?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.ComPensionAuthHistoryRecordMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComPensionAuthHistoryRecordDO">
        <id column="id" property="id" />
        <result column="user_id" property="userId" />
        <result column="name" property="name" />
        <result column="id_card" property="idCard" />
        <result column="brithday" property="brithday" />
        <result column="age" property="age" />
        <result column="domicile" property="domicile" />
        <result column="is_auth" property="isAuth" />
        <result column="create_at" property="createAt" />
        <result column="community_id" property="communityId" />
        <result column="elderlies_id" property="elderliesId" />
        <result column="auth_period" property="authPeriod" />
        <result column="submit_user_id" property="submitUserId" />
        <result column="auth_method" property="authMethod" />
        <result column="verification_result" property="verificationResult" />
        <result column="mark" property="mark" />
        <result column="is_alive" property="isAlive" />
        <result column="sex" property="sex" />
        <result column="auth_id" property="authId" />
        <result column="phone" property="phone" />
        <result column="auth_date" property="authDate" />
        <result column="approval_date" property="approvalDate" />
        <result column="approver_id" property="approverId" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, user_id, name, id_card, brithday, age, domicile, is_auth, create_at, community_id, elderlies_id, auth_period, submit_user_id, auth_method, verification_result, mark, is_alive, sex, auth_id, phone, auth_date, approval_date, approver_id
    </sql>

    <select id="pageAuthStatisticAdmin" resultType="com.panzhihua.common.model.vos.elders.ComPensionAuthStatisticVO">
        SELECT
            cpahr.id,
            cpahr.phone,
            cpahr.`name`,
            cpahr.id_card,
            cpahr.sex,
            cpahr.age,
            cpahr.is_alive,
            cpahr.auth_period,
            cpahr.auth_date,
            cpahr.auth_method,
            cpahr.mark,
            cpahr.is_auth,
            cpahr.submit_user_id,
            IFNULL(su.nick_name,su.`name`) as submitUserName,
            IFNULL(su1.nick_name,su1.`name`) as approvalName,
            cpap.address,
            cpar.auth_video,
            cpar.approval_status,
            cpahr.approver_id,
            cpahr.approval_date,
            cpahr.brithday
        FROM
            com_pension_auth_history_record AS cpahr
            LEFT JOIN com_pension_auth_pensioners AS cpap ON cpap.id = cpahr.elderlies_id
            left join sys_user as su on su.user_id = cpahr.submit_user_id
            left join sys_user as su1 on su1.user_id = cpahr.approver_id
            left join com_pension_auth_records as cpar on cpar.id = cpahr.auth_id
        <where>
            <if test="pensionAuthStatisticDTO.keyWord != null and pensionAuthStatisticDTO.keyWord !=&quot;&quot;">
                and (cpahr.`name` like concat (#{pensionAuthStatisticDTO.keyWord},'%') or
                cpahr.id_card = #{pensionAuthStatisticDTO.keyWord} or
                cpahr.mark like concat (#{pensionAuthStatisticDTO.keyWord},'%'))
            </if>
            <if test="pensionAuthStatisticDTO.authPeriod != null and pensionAuthStatisticDTO.authPeriod != &quot;&quot;">
                and cpahr.auth_period = #{pensionAuthStatisticDTO.authPeriod}
            </if>
            <if test="pensionAuthStatisticDTO.authStatus != null">
                and cpahr.is_auth = #{pensionAuthStatisticDTO.authStatus}
            </if>
            <if test="pensionAuthStatisticDTO.isAlive != null">
                and cpahr.is_alive = #{pensionAuthStatisticDTO.isAlive}
            </if>
            <if test="pensionAuthStatisticDTO.communityId != null">
                and cpahr.community_id = #{pensionAuthStatisticDTO.communityId}
            </if>
        </where>
        order by cpahr.create_at desc
    </select>

</mapper>

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

@@ -41,6 +41,7 @@
        cpar.auth_method,
        cpar.mark,
        cpar.approval_status,
        cpar.id,
        cpar.auth_status
        FROM
        com_pension_auth_records cpar
@@ -102,7 +103,7 @@
            com_pension_auth_records cpar
                LEFT JOIN com_pension_auth_pensioners cpap ON cpar.pensioner_id = cpap.id
                LEFT JOIN sys_user su ON cpar.submit_user_id = su.user_id
                LEFT JOIN sys_user su1 ON ccparear.approver_id = su1.user_id
                LEFT JOIN sys_user su1 ON cpar.approver_id = su1.user_id
        WHERE
            cpar.id = #{authRecordId}
    </select>