ERP接口

k94314517

2024-02-26 10c86e25b336b87486fed9434be9439a4c72e161

ERP接口

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java

@@ -272,6 +272,10 @@
    @TableField(exist = false)
    private Integer timeOut;

    @ApiModelProperty(value = "随访车辆数量", example = "1")
    @TableField(exist = false)
    private Integer carNum;

    @ApiModelProperty(value = "超时状态0未超时，1已超时，2即将超时", example = "1")
    @TableField(exist = false)
    private Integer outStatus;

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

@@ -886,13 +886,16 @@
                .eq(Member::getPhone,checkVisitedDTO.getMobile())
                .eq(validType.equals(Constants.ONE),Member::getName,checkVisitedDTO.getName())
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getStatus,Constants.ZERO)
//                .eq(Member::getStatus,Constants.ZERO)
                .eq(Member::getCanVisit,Constants.ONE)
                .eq(Member::getType,Constants.memberType.internal)
                .last(" limit 1 ")
        );
        MemberVO memberVO = new MemberVO();
        if(!Objects.isNull(member)){
            if(!member.getStatus().equals(Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"被访人账号异常，请确认后再试");
            }
            BeanUtils.copyProperties(member,memberVO);
        }else{
            throw new BusinessException(ResponseStatus.DATA_EMPTY);

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

@@ -123,7 +123,7 @@
        //普通访客
        visits.setType(Constants.ONE);
        //随行人员数量
        visits.setMemberNum(CollectionUtils.isNotEmpty(visits.getWithUserList())?visits.getWithUserList().size()+1:1);
        visits.setMemberNum(CollectionUtils.isNotEmpty(visits.getWithUserList())?visits.getWithUserList().size():0);
        //访客信息(使用身份证号查询是否已存在改普通访客，没有则新增，存在则更新openid等信息),包括随访人员校验和处理
        Member member =dealMemberAndVisits(visits);
        visits.setMemberId(member.getId());
@@ -978,6 +978,7 @@
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(Visits.class);
        queryWrapper.select("  ( select count(distinct(v.CAR_NOS)) from visits v where v.PARENT_ID = t.ID and v.CAR_NOS is not null  and v.CAR_NOS != ''  and v.CAR_NOS != t.CAR_NOS ) as carNum  ");
        queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
        queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
@@ -993,6 +994,12 @@
        queryWrapper.isNull(Visits::getParentId);
        queryWrapper.orderByDesc(Visits::getCreateDate);
        IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);

        for (Visits visits:result.getRecords()) {
            if(StringUtils.isNotBlank(visits.getCarNos())){
                visits.setCarNum(visits.getCarNum() + Constants.ONE);
            }
        }
        return PageData.from(result);
    }