整理

jiangping

2024-01-10 7da512973b40df83aa48fa9b57b4f365466e253b

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

@@ -126,14 +126,15 @@
        visits.setMemberId(member.getId());
        //初始化访客信息
        initVisitInfo(visits,date);
        visitsMapper.insert(visits);
        //发起ERP审批申请
        String erpId = startSendErpCheck(visits,visitMember);
        if(StringUtils.isNotBlank(erpId)){
            visits.setErpId(erpId);
            visitsMapper.updateById(visits);
        }else{
//            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，发起拜访审批申请失败！");
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，发起拜访审批申请失败！");
        }
        visitsMapper.insert(visits);
        initWithVisitInfo(visits);
        updateProblemLog(visits,problemLog,member);
        //创建审批记录
@@ -560,6 +561,15 @@
        ApproveAddRequest param = new ApproveAddRequest();
        List<Visits> withUserVisitsList = visits.getWithUserList();
        List<UserInfoRequest> withUserList = new ArrayList<>();
        UserInfoRequest mainUser = new UserInfoRequest();
        mainUser.setName(visits.getName());
        mainUser.setIdNo(DESUtil.decrypt(Constants.EDS_PWD, visits.getIdcardNo()));
        mainUser.setSex(visits.getSex());
        mainUser.setPhone(visits.getPhone());
        mainUser.setFaceImg(visits.getFaceImg());
        mainUser.setHealthImg(visits.getImgurl());
        withUserList.add(mainUser);

        if(CollectionUtils.isNotEmpty(withUserVisitsList)){
            for (Visits v:withUserVisitsList) {
                UserInfoRequest userInfoRequest = new UserInfoRequest();
@@ -571,14 +581,17 @@
                userInfoRequest.setHealthImg(v.getImgurl());
                withUserList.add(userInfoRequest);
            }
            param.setWithUserList(withUserList);
        }
        param.setWithUserList(withUserList);


        param.setId(visits.getId());
        param.setBeVisitedUserId(visitMember.getErpId());
        param.setVisitorWorkUint(visits.getCompanyName());
        param.setPurpose(visits.getReason());
        param.setStartTime(DateUtil.getDate(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss"));
        param.setEndTime(DateUtil.getDate(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss"));
        param.setStartTime(DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss"));
        param.setEndTime(DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss"));
        param.setBeVisitedOrgId(visitMember.getErpOrgId());
        if(StringUtils.isNotBlank(visits.getCarNos())){
            param.setCarNo(Arrays.asList(visits.getCarNos().split(",")));
        }
@@ -591,7 +604,7 @@
        }
        ApproveInfoResponse response = ErpTool.submitApprove(ErpConstants.approveUrl,param);
        if(!Objects.isNull(response)){
            return response.getId().toString();
            return visits.getId().toString();
        }
        return  null;
    }