ERP接口

k94314517

2024-01-09 b89c0df6f99cff6a852306da467b053aa4f90df8

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

@@ -620,10 +620,10 @@
            queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
            queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
            queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
            queryWrapper.selectAs(DeviceEvent::getCreateDate,DoorEventListResponse::getCreateTime);
            queryWrapper.selectAs(DeviceEvent::getHappenTime,DoorEventListResponse::getCreateTime);
            queryWrapper.selectAs(Member::getPhone,DoorEventListResponse::getPhone);
            queryWrapper.selectAs(Member::getErpId,DoorEventListResponse::getUserId);
            queryWrapper.selectAs(Member::getCompanyId,DoorEventListResponse::getOrgId);
            queryWrapper.selectAs(Member::getErpOrgId,DoorEventListResponse::getOrgId);
            queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo);

            if(!Objects.isNull(doorEventListRequest)){
@@ -799,7 +799,7 @@
                    ||Objects.isNull(param.getIdType())//证件类型
                    ||Objects.isNull(param.getSex())//性别
                    ||Objects.isNull(param.getOrgId())//所属组织编码
                    ||StringUtils.isBlank(param.getFaceImg())//人脸照片
//                    ||StringUtils.isBlank(param.getFaceImg())//人脸照片
                    ||StringUtils.isBlank(param.getCode())//工号
                    ||StringUtils.isBlank(param.getPhone())//手机号
             ){
@@ -830,7 +830,6 @@
                member.setErpOrgId(param.getOrgId());
                doorIds = getRoleIdByParam(param.getRoleIds(),member);
                memberMapper.insert(member);
                //TODO 海康数据创建-------------修改-------------------
            }else{
                Integer id = member.getId();
                BeanUtils.copyProperties(param,member);
@@ -848,7 +847,6 @@
                memberMapper.updateById(member);
                //删除用户卡片数据  人员角色关联
                memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
                //TODO 海康数据更新
            }
            //如果有授权门禁数据，进行用户授权数据下发任务创建
            dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());