添加merger缺少代码

puhanshu

2021-09-13 46da6fb73dfd33f39edf8f897212aa3a4f3d9703

添加merger缺少代码

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

@@ -2,6 +2,8 @@

import java.util.List;

import com.panzhihua.common.model.vos.community.ComPensionAuthRecordExcleVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordStatisticExcleVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;


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

@@ -84,12 +84,12 @@
    /**
    * 是否高龄老人登记（1.是  0.否）
    */
    private Boolean isRegister;
    private Integer isRegister;

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

    /**
    * 居住地址

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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComElderAuthRecordExcleVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportMistakeExcelVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordStatisticExcleVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -366,14 +370,6 @@
        return ObjectUtils.isEmpty(hashMap.get(key));
    }

    @Resource
    private ComElderAuthRecordsDAO comElderAuthRecordsDAO;
    @Resource
    private ComElderAuthElderliesDAO comElderAuthElderliesDAO;

    @Value("${domain.aesKey:}")
    private String aesKey;

    /**
     * 新增高龄认证
     * @param addIdentityAuthDTO 请求参数
@@ -406,7 +402,7 @@
                        .eq(ComElderAuthRecordsDO::getAuthPeriod, currentAuthPeriod)
                        .eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId()));
        if (!currentAuthPeriodRecords.isEmpty()) {
            if (currentAuthPeriodRecords.stream().filter(record -> record.getAuthStatus()).findFirst().isPresent()) {
            if (currentAuthPeriodRecords.stream().filter(record -> record.getAuthStatus().equals(1)).findFirst().isPresent()) {
                return R.fail(String.format("该人员%s期已认证无需重复认证", currentAuthPeriod));
            }
            if (currentAuthPeriodRecords.stream().filter(record -> record.getApprovalStatus().intValue() == 1).findFirst().isPresent()) {
@@ -421,16 +417,12 @@
        if (addIdentityAuthDTO.getType().intValue() == 2) {
            comElderAuthRecordsDO.setApprovalStatus(3);
            comElderAuthRecordsDO.setApprovalDate(dateNow);
            comElderAuthRecordsDO.setAuthStatus(true);
            comElderAuthRecordsDO.setAuthStatus(1);
        }
        if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) {
            return R.fail("认证失败，请重新尝试");
        }
        return R.ok();
    }

    public static void main(String[] args) throws Exception {
        System.out.println(AESUtil.encrypt128("500381199804034737", "Ryo7M3n8loC5"));
    }

    /**

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

@@ -9,6 +9,12 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComPensionAuthRecordExcleVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportMistakeExcelVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordStatisticExcleVO;
import com.panzhihua.service_community.dao.ComPensionAuthStatisticsDAO;
import com.panzhihua.service_community.model.dos.ComPensionAuthStatisticsDO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -337,14 +343,6 @@
        return ObjectUtils.isEmpty(hashMap.get(key));
    }

    @Resource
    private ComPensionAuthRecordDAO comPensionAuthRecordDAO;
    @Resource
    private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;

    @Value("${domain.aesKey:}")
    private String aesKey;

    /**
     * 新增养老认证
     * @param addIdentityAuthDTO 请求参数
@@ -377,7 +375,7 @@
                        .eq(ComPensionAuthRecordDO::getAuthPeriod, currentAuthPeriod)
                        .eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.getId()));
        if (!currentAuthPeriodRecords.isEmpty()) {
            if (currentAuthPeriodRecords.stream().filter(record -> record.getAuthStatus()).findFirst().isPresent()) {
            if (currentAuthPeriodRecords.stream().filter(record -> record.getAuthStatus().equals(1)).findFirst().isPresent()) {
                return R.fail(String.format("该人员%s期已认证无需重复认证", currentAuthPeriod));
            }
            if (currentAuthPeriodRecords.stream().filter(record -> record.getApprovalStatus().intValue() == 1).findFirst().isPresent()) {
@@ -392,7 +390,7 @@
        if (addIdentityAuthDTO.getType().intValue() == 2) {
            comPensionAuthRecordDO.setApprovalStatus(3);
            comPensionAuthRecordDO.setApprovalDate(dateNow);
            comPensionAuthRecordDO.setAuthStatus(true);
            comPensionAuthRecordDO.setAuthStatus(1);
        }
        if (this.baseMapper.insert(comPensionAuthRecordDO) < 0) {
            return R.fail("认证失败，请重新尝试");