Merge branch 'test' into 'test_bak'

罗元桥

2021-10-09 1f9c0e8663d2b7b59d03caf9257afb7526a88ec3

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

@@ -1,11 +1,14 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.elders.ComPensionAuthStatisticVO;
import com.panzhihua.service_community.dao.ComPensionAuthHistoryRecordMapper;
import com.panzhihua.service_community.model.dos.ComPensionAuthHistoryRecordDO;
import com.panzhihua.service_community.service.ComPensionAuthHistoryRecordService;
@@ -28,7 +31,13 @@
     */
    @Override
    public R pagePensionAuthStatisticAdmin(PagePensionAuthStatisticDTO pensionAuthStatisticDTO){
        return R.ok(this.baseMapper.pageAuthStatisticAdmin(new Page(pensionAuthStatisticDTO.getPageNum(),pensionAuthStatisticDTO.getPageSize()),pensionAuthStatisticDTO));
        IPage<ComPensionAuthStatisticVO> authStatisticPage = this.baseMapper.pageAuthStatisticAdmin(new Page(
                pensionAuthStatisticDTO.getPageNum(),pensionAuthStatisticDTO.getPageSize()),pensionAuthStatisticDTO);
        authStatisticPage.getRecords().forEach(authStatistic -> {
            authStatistic.setAge(IdcardUtil.getAgeByIdCard(authStatistic.getIdCard()));
            authStatistic.setBirthday(IdcardUtil.getBirth(authStatistic.getIdCard()));
        });
        return R.ok(authStatisticPage);
    }

    /**