bug修复

huanghongfa

2021-10-09 119357438002949cbb14f7db3fe1ea376232afbc

bug修复

 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);
    }

    /**

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

@@ -83,7 +83,7 @@
            ceahr.submit_user_id,
            IFNULL(su.nick_name,su.`name`) as submitUserName,
            IFNULL(su1.nick_name,su1.`name`) as approvalName,
            ceahr.address,
            cear.address,
            cear.auth_video,
            cear.approval_status,
            ceahr.approver_id,

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

@@ -51,7 +51,7 @@
            cpahr.submit_user_id,
            IFNULL(su.nick_name,su.`name`) as submitUserName,
            IFNULL(su1.nick_name,su1.`name`) as approvalName,
            cpap.address,
            cpar.address,
            cpar.auth_video,
            cpar.approval_status,
            cpahr.approver_id,