ERP接口

k94314517

2024-02-26 108189b4a9f2948647b60aeac4f777bc237c532e

ERP接口

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -683,11 +683,11 @@
    }

    private Member getMemberListParam(String cardno, Visits visits, List<Member> addList, List<Member> editList) {
        if(!StringUtils.isNotBlank(visits.getCarNos())
//                &&!Constants.checkCarNo(visits.getCarNos())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，车牌号【"+visits.getCarNos()+"】不合法，请核实后重试~");
        }
//        if(!StringUtils.isNotBlank(visits.getCarNos())
////                &&!Constants.checkCarNo(visits.getCarNos())
//        ){
//            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，车牌号【"+visits.getCarNos()+"】不合法，请核实后重试~");
//        }
        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
            //&&!IdcardUtil.isValidCard(cardno)
        ){
@@ -1017,7 +1017,7 @@
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Visits.class);
        queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
        queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.ENDTIME) AS timeOut");
        queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) AS timeOut");
        queryWrapper.selectAs(Member::getType,Visits::getMemberType);
        queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
@@ -1026,7 +1026,7 @@

        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getLevelStatus()),Visits::getStatus,Constants.VisitStatus.signin);

        queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getLevelStatus())," TIMESTAMPDIFF( MINUTE, NOW(), t.ENDTIME) <= "+code+"  ");
        queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getLevelStatus())," TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) <= "+code+"  ");

        queryWrapper.ne("m.type ",Constants.TWO);
        queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
@@ -1041,14 +1041,15 @@
        IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);
        if(result!=null&&result.getRecords()!=null){
            result.getRecords().stream().forEach(s ->{
                if(s.getTimeOut()<=Integer.valueOf(code)&&s.getTimeOut()>=0){
                    s.setOutStatus(Constants.TWO);
                }else if(s.getTimeOut()>Constants.ZERO){
                    s.setOutStatus(Constants.ZERO);
                }else{
                    s.setOutStatus(Constants.ONE);
                if(s.getStatus().equals(Constants.VisitStatus.signin)){
                    if(s.getTimeOut()<=Integer.valueOf(code)&&s.getTimeOut()>=0){
                        s.setOutStatus(Constants.TWO);
                    }else if(s.getTimeOut()>Constants.ZERO){
                        s.setOutStatus(Constants.ZERO);
                    }else{
                        s.setOutStatus(Constants.ONE);
                    }
                }

            });
        }