访客系统
上一版本: eb295c5c | 补丁 | 提交 | 显示空白
liukangdong
2024-05-09 b99c3c47930374bb7dbb1a427b4b32f31b6172cd 
Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
已修改1个文件
6 ■■■■■ 文件已修改
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java


@@ -863,7 +863,11 @@


        }


        //根据手机号和身份证号码查询 当前预约的时间是否与其他预约记录有冲突


        if (visitsMapper.selectCount(new QueryWrapper<Visits>().lambda()


                        .notIn(Visits::getStatus,Constants.VisitStatus.cancel,Constants.VisitStatus.noPass,Constants.VisitStatus.xfFail,Constants.VisitStatus.signout,Constants.VisitStatus.invalid)


                        .notIn(Visits::getStatus,Constants.VisitStatus.cancel


                                ,Constants.VisitStatus.noPass


                                ,Constants.VisitStatus.xfFail


                                ,Constants.VisitStatus.signout


                                ,Constants.VisitStatus.invalid)


                .eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno))


                .and(ms -> ms.eq(Visits::getPhone, visits.getPhone())


                        .or().eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno)))