bug修复

huanghongfa

2021-10-09 7b7bfcd1a6f88e6bd20b0cfa068c1692d840c766

bug修复

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

@@ -98,6 +98,13 @@
                    index++;
                    mistakes.add(setErrorObject(oneData,"名字不可为空，请填写姓名"));
                    continue;
                }else{
                    //判断导入的名字的长度是否超过10
                    if(oneData.get(0).length() > 10){
                        index++;
                        mistakes.add(setErrorObject(oneData,"名字长度不可超过10，请重新填写姓名"));
                        continue;
                    }
                }
                vo.setName(oneData.get(0));
                if (StringUtils.isEmpty(oneData.get(1))) {

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

@@ -205,7 +205,13 @@
            if(!isOnly(memberExcel.getIdCard(),memberMap)){
                ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
                BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
                //判断该成员是否是已存在还是身份证号码重复
                ComClusterOrganizationMemberDO memberDO = (ComClusterOrganizationMemberDO)memberMap.get(memberExcel.getIdCard());
                if(memberDO.getName().equals(memberExcel.getName())){
                memberExcelErrorVO.setError("该成员已存在");
                }else{
                    memberExcelErrorVO.setError("身份证号重复");
                }
                mistakes.add(memberExcelErrorVO);
                continue;
            }

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

@@ -621,7 +621,8 @@
        });

        //查询高龄认证记录列表
        List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(null);
        List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda()
                .eq(ComElderAuthRecordsDO::getAuthStatus,ComElderAuthRecordsDO.authStatus.yrz));
        //遍历高龄认证记录列表
        authRecordsList.forEach(authRecords -> {
            if(authRecords.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)){
@@ -662,7 +663,8 @@
        });

        //查询养老认证记录列表
        List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(null);
        List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
                .eq(ComPensionAuthRecordDO::getAuthStatus,ComPensionAuthRecordDO.authStatus.rez));
        //遍历养老认证记录列表
        pensionAuthList.forEach(authRecords -> {
            ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()

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

@@ -318,7 +318,7 @@
    </select>

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

    <select id="queryRecordWithPage" resultType="com.panzhihua.common.model.vos.community.IdentityAuthRecordDetailVO">

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

@@ -340,6 +340,6 @@
    </select>

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