productDev/dmvisit.git

			@@ -3,7 +3,11 @@
			import cn.hutool.core.util.IdcardUtil;
			import com.doumee.biz.system.SystemDictDataBiz;
			import com.doumee.core.constants.ResponseStatus;
			import com.doumee.core.erp.ErpConstants;
			import com.doumee.core.erp.ErpTool;
			import com.doumee.core.erp.model.openapi.request.erp.ApproveAddRequest;
			import com.doumee.core.erp.model.openapi.request.erp.UserInfoRequest;
			import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
			import com.doumee.core.exception.BusinessException;
			import com.doumee.core.haikang.model.HKConstants;
			import com.doumee.core.haikang.model.HKTools;
			@@ -32,6 +36,7 @@
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import io.swagger.models.auth.In;
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			@@ -40,6 +45,7 @@
			import org.springframework.util.DigestUtils;

			import java.util.*;
			import java.util.stream.Collectors;

			/**
			* 访客申请信息表Service实现
			@@ -86,7 +92,7 @@
			//获取申请的海康访问门禁组信息
			String[] hkIds = getHkDeviceRoles(visits);
			//检验拜访人是否合法
			isValideVisitedUser(visits.getReceptMemberId());
			Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
			if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType()) &&!IdcardUtil.isValidCard(visits.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证号码有误，请核实后重试！");
			}
			@@ -96,9 +102,9 @@
			//初始化访客信息
			initVisitInfo(visits,date);
			//发起ERP审批申请
			String erpid = startSendErpCheck(visits);
			if(StringUtils.isNotBlank(erpid)){
			visits.setErpId(erpid);
			String erpId = startSendErpCheck(visits,visitMember);
			if(StringUtils.isNotBlank(erpId)){
			visits.setErpId(erpId);
			}else{
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，发起拜访审批申请失败！");
			}
			@@ -196,9 +202,43 @@
			visits.setCreateDate(date);
			}

			private String startSendErpCheck(Visits visits) {
			//TODO ------------RK--------------
			// ErpTool.submitApprove()
			private String startSendErpCheck(Visits visits,Member visitMember) {
			ApproveAddRequest param = new ApproveAddRequest();
			List<Visits> withUserVisitsList = visits.getWithUserList();
			List<UserInfoRequest> withUserList = new ArrayList<>();
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(withUserVisitsList)){
			for (Visits v:withUserVisitsList) {
			UserInfoRequest userInfoRequest = new UserInfoRequest();
			userInfoRequest.setName(v.getName());
			userInfoRequest.setIdNo(v.getIdcardNo());
			userInfoRequest.setSex(v.getSex());
			userInfoRequest.setPhone(v.getPhone());
			userInfoRequest.setFaceImg(v.getFaceImg());
			userInfoRequest.setHealthImg(v.getImgurl());
			withUserList.add(userInfoRequest);
			}
			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"));
			if(StringUtils.isNotBlank(visits.getCarNos())){
			param.setCarNo(Arrays.asList(visits.getCarNos().split(",")));
			}
			if(StringUtils.isNotBlank(visits.getDoors())){
			List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda().in(DeviceRole::getId,Arrays.asList(visits.getDoors().split(","))));
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceRoleList)){
			param.setRoleIds(deviceRoleList.stream().map(m->m.getId()).collect(Collectors.toList()));
			param.setRoleNames(deviceRoleList.stream().map(m->m.getName()).collect(Collectors.toList()));
			}
			}
			ApproveInfoResponse response = ErpTool.submitApprove(ErpConstants.approveUrl,param);
			if(!Objects.isNull(response)){
			return response.getId().toString();
			}
			return null;
			}

			@@ -525,4 +565,33 @@
			QueryWrapper<Visits> wrapper = new QueryWrapper<>(visits);
			return visitsMapper.selectCount(wrapper);
			}


			@Override
			public PageData<Visits> retentionPage(PageWrap<Visits> pageWrap) {
			IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();

			queryWrapper.selectAll(Visits.class);
			queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
			queryWrapper.select("TIMESTAMPDIFF(MINUTE,t.ENDTIME , NOW()) AS timeOut");
			queryWrapper.selectAs(Member::getType,Visits::getMemberType);
			queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
			queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);

			queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
			queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Visits::getType,pageWrap.getModel().getType());
			queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()),ms->ms.like(Visits::getPhone,pageWrap.getModel().getName())
			.or().like(Visits::getPhone,pageWrap.getModel().getName()))
			.eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Visits::getIdcardNo,StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()))
			.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Visits::getCompanyName,pageWrap.getModel().getCompanyName())
			.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Visits::getStatus,pageWrap.getModel().getStatus());
			queryWrapper.isNull(Visits::getOutDate);
			queryWrapper.orderByDesc(Visits::getEditDate);
			IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);

			return PageData.from(result);
			}

			}