ERP接口

k94314517

2024-02-27 9f2c35bcddcd835efc25ed53d3a9c8816781bb5f

ERP接口

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

@@ -206,6 +206,11 @@
    @ExcelColumn(name="openid")
    private String openid;


    @ApiModelProperty(value = "访客预约方式：0登记预约 1免登记预约", example = "1")
    @ExcelColumn(name="访客预约方式：0登记预约 1免登记预约")
    private Integer visitType;

    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步 ", example = "1")
    @ExcelColumn(name="海康同步状态 0未同步 1已同步")
    private Integer hkStatus;

 server/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java

@@ -24,6 +24,9 @@
    @ApiModelProperty(value = "拜访事由")
    private String visitReason;

    @ApiModelProperty(value = "拜访人手机号")
    private String phone;

    @ApiModelProperty(value = "车辆信息")
    private String carNos;


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

@@ -300,6 +300,7 @@
        queryWrapper.like(Objects.nonNull(pageWrap.getModel().getCode()),MemberCard::getCode,pageWrap.getModel().getCode())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
                .   eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType())
                    .like(number,Member::getPhone,pageWrap.getModel().getKeyword())
                    .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyword());
        IPage<MemberCard> memberCardIPage = memberCardJoinMapper.selectJoinPage(page, MemberCard.class,queryWrapper);

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

@@ -665,9 +665,8 @@
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status = 2  ) as visitsCount")
                .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0  and v.status = 2  order by CREATE_DATE limit 1) as visitsLastDate");

                .selectAs(Member::getLastVisitDate,MemberInfoDTO::getVisitsLastDate)
                .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status  in (7,8) ) as visitsCount");
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ms->ms.like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName())

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

@@ -127,6 +127,7 @@
        //访客信息(使用身份证号查询是否已存在改普通访客，没有则新增，存在则更新openid等信息),包括随访人员校验和处理
        Member member =dealMemberAndVisits(visits);
        visits.setMemberId(member.getId());
        visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode()));
        //初始化访客信息
        initVisitInfo(visits,date);
        visitsMapper.insert(visits);
@@ -548,6 +549,8 @@
                v.setHkStatus(Constants.ZERO);
                v.setReason(visits.getReason());
                v.setDoors(visits.getDoors());
                v.setType(visits.getType());
                v.setVisitType(visits.getVisitType());
                v.setStatus(Constants.VisitStatus.submitCheck);
            }
            //批量插入数据
@@ -1074,6 +1077,7 @@
        VisitDetailVO visitDetailVO = new VisitDetailVO();
        visitDetailVO.setStatus(visits.getStatus());
        visitDetailVO.setCarNos(visits.getCarNos());
        visitDetailVO.setPhone(visits.getPhone());
        visitDetailVO.setVisitUserName(member.getName());
        visitDetailVO.setVisitReason(visits.getReason());
        visitDetailVO.setVisitTime(DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm") + " 至 " + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm") );