From 22a00c47589ded6699a563690ee5545b73eaca01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 09:30:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 551 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 370 insertions(+), 181 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 041f876..72e79ad 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -3,34 +3,50 @@
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;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest;
+import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
+import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.DeviceRoleMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.ProblemLogMapper;
import com.doumee.dao.business.VisitsMapper;
-import com.doumee.dao.business.model.DeviceRole;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.ProblemLog;
-import com.doumee.dao.business.model.Visits;
+import com.doumee.dao.business.join.DeviceJoinMapper;
+import com.doumee.dao.business.join.VisitsJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.VisitsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.DigestUtils;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 璁垮鐢宠淇℃伅琛⊿ervice瀹炵幇
@@ -48,9 +64,15 @@
private ProblemLogMapper problemLogMapper ;
@Autowired
private MemberMapper memberMapper ;
+ @Autowired
+ private VisitsJoinMapper visitsJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private DeviceJoinMapper deviceJoinMapper;
+
+
@Override
public Integer create(Visits visits) {
visitsMapper.insert(visits);
@@ -63,7 +85,41 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer createFk(Visits visits) {
+ isValidBaseParam(visits);
+ //妫�鏌ユ槸鍚﹀繀椤荤瓟棰橈紝骞朵笖绗﹀悎绛旈瑕佹眰
+ ProblemLog problemLog = isValidProblemLog(visits);
+ //鑾峰彇鐢宠鐨勬捣搴疯闂棬绂佺粍淇℃伅
+ String[] hkIds = getHkDeviceRoles(visits);
+ //妫�楠屾嫓璁夸汉鏄惁鍚堟硶
+ Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
+ if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType()) &&!IdcardUtil.isValidCard(visits.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
+ }
+ Date date = new Date();
+ //璁垮淇℃伅(浣跨敤韬唤璇佸彿鏌ヨ鏄惁宸插瓨鍦ㄦ敼鏅�氳瀹紝娌℃湁鍒欐柊澧烇紝瀛樺湪鍒欐洿鏂皁penid绛変俊鎭�),鍖呮嫭闅忚浜哄憳鏍￠獙鍜屽鐞�
+ Member member =dealMemberAndVisits(visits);
+ //鍒濆鍖栬瀹俊鎭�
+ initVisitInfo(visits,date);
+ //鍙戣捣ERP瀹℃壒鐢宠
+ String erpId = startSendErpCheck(visits,visitMember);
+ if(StringUtils.isNotBlank(erpId)){
+ visits.setErpId(erpId);
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鍙戣捣鎷滆瀹℃壒鐢宠澶辫触锛�");
+ }
+ visitsMapper.insert(visits);
+ initWithVisitInfo(visits);
+ updateProblemLog(visits,problemLog,member);
+ return visits.getId();
+ }
+
+ /**
+ * 鏍￠獙蹇呭～椤规暟鎹槸鍚﹀悎娉�
+ * @param visits
+ */
+ private void isValidBaseParam(Visits visits) {
if(visits.getStarttime() == null
|| visits.getEndtime() == null
|| StringUtils.isBlank(visits.getReason())
@@ -75,42 +131,237 @@
|| visits.getReceptMemberId() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
}
- //妫�鏌ユ槸鍚﹀繀椤荤瓟棰橈紝骞朵笖绗﹀悎绛旈瑕佹眰
- ProblemLog problemLog = isValidProblemLog(visits);
- //鑾峰彇鐢宠鐨勬捣搴疯闂棬绂佺粍淇℃伅
- String[] hkIds = getHkDeviceRoles(visits);
- //妫�楠屾嫓璁夸汉鏄惁鍚堟硶
- isValideVisitedUser(visits.getReceptMemberId());
- //妫�鏌ラ殢璁夸汉鍛樻槸鍚﹀悎娉�,鐢熸垚闅忚浜哄憳鏂板闆嗗悎
- List<Member> withUsers = isValideWithUsers(visits.getWithUserList());
-
- if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType()) &&!IdcardUtil.isValidCard(visits.getIdcardNo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
+ if(visits.getStarttime().getTime() < System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害寮�濮嬫椂闂村繀椤诲ぇ浜庡綋鍓嶆椂闂达紒");//
}
- Date date = new Date();
-
- visits.setBirthday(Constants.getBirthdyByCardNo(visits.getIdcardNo()));
- //韬唤璇佸彿瀛樺偍瀵嗘枃
- visits.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, visits.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
- visits.setIdcardDecode(Constants.getTuominStr(visits.getIdcardNo()));//鑴辨晱鎵嬫満鍙�
- visits.setCreateDate(date);
-
- //璁垮淇℃伅(浣跨敤韬唤璇佸彿鏌ヨ鏄惁宸插瓨鍦ㄦ敼鏅�氳瀹紝娌℃湁鍒欐柊澧烇紝瀛樺湪鍒欐洿鏂皁penid绛変俊鎭�)
- Member member = getMemberByIdcardno(visits);
- visitsMapper.insert(visits);
-
-
- updateProblemLog(visits,problemLog,member);
-
- return visits.getId();
+ if(visits.getEndtime().getTime() <= visits.getStarttime().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害缁撴潫鏃堕棿蹇呴』澶т簬寮�濮嬫椂闂达紒");//
+ }
+ }
+ private void isValidWithVisitParam(Visits visits, List<Member> addList, List<Member> updateList) {
+ if( StringUtils.isBlank( visits.getName())
+ || StringUtils.isBlank( visits.getPhone())
+ || visits.getIdcardType() == null
+ || StringUtils.isBlank( visits.getFaceImg() )
+ || StringUtils.isBlank( visits.getIdcardNo() )
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
+ }
+ if(visits.getStarttime().getTime() < System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害寮�濮嬫椂闂村繀椤诲ぇ浜庡綋鍓嶆椂闂达紒");//
+ }
+ if(visits.getEndtime().getTime() <= visits.getStarttime().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝棰勭害缁撴潫鏃堕棿蹇呴』澶т簬寮�濮嬫椂闂达紒");//
+ }
+ if(isRepeatedMember(visits,addList,updateList)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鎵嬫満鍙锋垨韬唤璇佸彿鍑虹幇閲嶅鏁版嵁锛岃淇敼鍚庨噸鏂版彁浜わ紒");//
+ }
}
- private Member getMemberByIdcardno(Visits idcardNo) {
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
-// .eq(Member::getType,Constants.MEMBER_TYPE)
- .eq(Member::getIdcardNo,idcardNo.getIdcardNo())
- );
+ private boolean isRepeatedMember(Visits visits, List<Member> addList, List<Member> updateList) {
+ if(addList.size()>0){
+ for(Member m :addList){
+ if(StringUtils.equals(visits.getPhone(), m.getPhone()) || StringUtils.equals(visits.getIdcardNo(), m.getIdcardDecode())){
+ return true;
+ }
+ }
+ }
+ if(updateList.size()>0){
+ for(Member m :updateList){
+ if(StringUtils.equals(visits.getPhone(), m.getPhone()) || StringUtils.equals(visits.getIdcardNo(), m.getIdcardDecode())){
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private void initWithVisitInfo(Visits visits) {
+ if(visits.getWithUserList()!=null && visits.getLwWithUserList().size()>0){
+ for(Visits v :visits.getWithUserList()){
+ v.setParentId(visits.getId());
+ v.setStarttime(visits.getStarttime());
+ v.setEndtime(visits.getEndtime());
+ v.setIsdeleted(Constants.ZERO);
+ v.setCreateDate(visits.getCreateDate());
+ v.setErpId(visits.getErpId());
+ v.setHkStatus(Constants.ZERO);
+ v.setStatus(Constants.ZERO);
+ }
+ //鎵归噺鎻掑叆鏁版嵁
+ visitsMapper.insertBatchSomeColumn(visits.getWithUserList());
+ }
+ }
+
+ private void initVisitInfo(Visits visits,Date date) {
+ visits.setHkStatus(Constants.ZERO);//鏈悓姝�
+ visits.setBirthday(Constants.getBirthdyByCardNo(visits.getIdcardNo()));
+ visits.setStatus(Constants.ZERO);//寰呭鎵�
+ visits.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, visits.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
+ //韬唤璇佸彿瀛樺偍瀵嗘枃
+ visits.setIdcardDecode(Constants.getTuominStr(visits.getIdcardNo()));//鑴辨晱鎵嬫満鍙�
+ visits.setCreateDate(date);
+ }
+
+ 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;
+ }
+
+ private String visitAppiontment(Visits visits) {
+ VisitAppointmentRequest param = new VisitAppointmentRequest();
+ param.setVisitStartTime(DateUtil.getISO8601Timestamp(visits.getStarttime()));
+ param.setVisitEndTime(DateUtil.getISO8601Timestamp(visits.getStarttime()));
+ BaseResponse<VisitAppointmentResponse> res = HKService.visitAppiontment(param);
+ if(res==null || !StringUtils.equals(res.getCode(), HKConstants.RESPONSE_SUCCEE) || res.getData()==null){
+ //濡傛灉鍙戣捣棰勭害澶辫触
+ visits.setStatus(Constants.VisitStatus.xfFail);
+ }else{
+ visits.setStatus(Constants.VisitStatus.xfSuccess);
+ visits.setHkStatus(Constants.ONE);
+ visits.setHkId(res.getData().getAppointRecordId());
+ }
+ visits.setHkDate(visits.getCheckDate());
+ return res.getData().getAppointRecordId();
+ }
+
+ /**
+ * 璁垮淇℃伅(浣跨敤韬唤璇佸彿鏌ヨ鏄惁宸插瓨鍦ㄦ敼鏅�氳瀹紝娌℃湁鍒欐柊澧烇紝瀛樺湪鍒欐洿鏂皁penid绛変俊鎭�),鍖呮嫭闅忚浜哄憳鏍￠獙鍜屽鐞�
+ * @param visits
+ * @return
+ */
+ private Member dealMemberAndVisits(Visits visits ) {
+ if(StringUtils.isNotBlank(visits.getOpenid())){
+ //鍏堟竻绌哄師鏈夎瀹㈢殑openid缁戝畾鍏崇郴
+ memberMapper.update(null, new UpdateWrapper<Member>().lambda()
+ .eq(Member::getType,Constants.memberType.visitor)
+ .eq(Member::getOpenid,visits.getOpenid())
+ .set(Member::getOpenid,null)
+ );
+ }
+ List<Member> addList = new ArrayList<>();
+ List<Member> editList = new ArrayList<>();
+ //鐢宠浜轰俊鎭�
+ Member m = getMemberListParam(visits.getIdcardNo(),visits,addList,editList);
+ //闅忚浜哄憳淇℃伅澶勭悊
+ if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){
+ for(Visits model:visits.getWithUserList()){
+ //鏍￠獙闅忚浜哄憳濉姤鏁版嵁鍚堟硶鎬�
+ isValidWithVisitParam(model,addList,editList);
+ model.setCreateDate(visits.getCreateDate());
+ getMemberListParam(model.getIdcardNo(),visits,addList,editList);
+ }
+ }
+ return m;
+ }
+
+ private Member getMemberListParam(String cardno, Visits visits, List<Member> addList, List<Member> editList) {
+ if(!Constants.checkCarNo(visits.getCarNos())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝杞︾墝鍙枫��"+visits.getCarNos()+"銆戜笉鍚堟硶锛岃鏍稿疄鍚庨噸璇晘");
+ }
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq(Member::getType,Constants.memberType.visitor)
+ .eq(Member::getIdcardType,visits.getIdcardType())
+ .eq(Member::getIdcardNo,visits.getIdcardNo()).last("limit 1" )
+ );
+ if(member == null){
+ //濡傛灉鐢ㄦ埛涓嶅瓨鍦紝鍒欐柊澧�
+ member.setCreateDate(visits.getCreateDate());
+ member.setIsdeleted(Constants.ZERO);
+ member.setIdcardNo(visits.getIdcardNo());
+ member.setIdcardDecode(visits.getIdcardDecode());
+ member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//韬唤璇佸彿鍔犲瘑
+ member.setIdcardDecode(Constants.getTuominStr(cardno));//鑴辨晱鎵嬫満鍙�
+ member.setName(visits.getName());
+ member.setPhone(visits.getPhone());
+ member.setOpenid(visits.getOpenid());
+ member.setType(Constants.memberType.visitor);
+ member.setStatus(Constants.ZERO);
+ member.setSex(Constants.getSexByCardNo(cardno));
+ // 鏂板璁垮璁板綍
+ addList.add(member);
+ }else{
+ if(!Constants.equalsInteger(Constants.ZERO,member.getStatus() )){
+ //濡傛灉鐢ㄦ埛鐘舵�佸紓甯革紝鍒欐彁绀�
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璇ヨ韩浠借瘉鍙疯绂佹璁块棶鐢宠锛屽鏈夌枒闂紝璇疯仈绯绘偍鐨勬嫓璁夸汉杩涜鏍稿疄");
+ }
+ //鏍告煡棰勭害鐢ㄦ埛鏄惁瀛樺湪鏈绂荤殑棰勭害璁板綍
+ isExsitNoOutVisisRecord(member);
+ member.setEditDate(visits.getCreateDate());
+ member.setIsdeleted(Constants.ZERO);
+ member.setIdcardNo(visits.getIdcardNo());
+ member.setIdcardDecode(visits.getIdcardDecode());
+ member.setName(visits.getName());
+ member.setPhone(visits.getPhone());
+ member.setOpenid(visits.getOpenid());
+ member.setSex(Constants.getSexByCardNo(cardno));
+ // 鏇存柊璁垮淇℃伅,
+ editList.add(member);
+ }
+ //鏍规嵁鎵嬫満鍙峰拰韬唤璇佸彿鐮佹煡璇� 褰撳墠棰勭害鐨勬椂闂存槸鍚︿笌鍏朵粬棰勭害璁板綍鏈夊啿绐�
+ if (visitsMapper.selectCount(new QueryWrapper<Visits>().lambda()
+ .eq(Visits::getPhone, member.getPhone())
+ .and(ms -> ms.eq(Visits::getPhone, member.getPhone())
+ .or().eq(Visits::getIdcardDecode, member.getIdcardDecode()))
+ .and(ms -> ms.apply(" visits.STARTTIME <= '" + visits.getStarttime() + "' and visits.ENDTIME >= '" + visits.getStarttime() + "' ")
+ .or().apply(" visits.STARTTIME <= '" + visits.getEndtime() + "' and visits.ENDTIME >= '" + visits.getEndtime() + "' ")
+ )) > Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎵嬫満鍙枫��"+member.getPhone()+"銆戞垨韬唤璇併��"+ member.getIdcardDecode() +"銆戝瓨鍦ㄩ绾︽椂闂村啿绐侊紝鏃犳硶鐢宠鍝︼紒");
+ }
+ return member;
+ }
+
+ /**
+ * 鏍告煡棰勭害鐢ㄦ埛鏄惁瀛樺湪鏈绂荤殑棰勭害璁板綍
+ * @param member
+ */
+ private void isExsitNoOutVisisRecord(Member member) {
+ Visits v = visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
+ .eq(Visits::getPhone, member.getPhone())
+ .eq(Visits::getStatus,Constants.VisitStatus.xfSuccess)
+ .last(" limit 1" )
+ );
+ if(v !=null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎵嬫満鍙枫��"+member.getPhone()+"銆戝瓨鍦ㄦ湭绛剧棰勭害鐢宠锛屼笉鑳介噸澶嶇敵璇峰摝锛�");
+ }
+
+
+
}
private List<Member> isValideWithUsers(List<Visits> withUserList) {
@@ -255,7 +506,38 @@
@Override
public Visits findById(Integer id) {
- return visitsMapper.selectById(id);
+
+ MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Visits.class);
+ queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
+ 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::getId,id);
+ Visits result = visitsJoinMapper.selectJoinOne(Visits.class,queryWrapper);
+
+ if(result!=null){
+ if(StringUtils.isNotBlank(result.getDoors())){
+ String[] doorList=result.getDoors().split(",");
+ MPJLambdaWrapper<Device> deviceQuery = new MPJLambdaWrapper<>();
+ deviceQuery.in(Device::getId,doorList);
+ List<Device> deviceList= deviceJoinMapper.selectList(deviceQuery);
+ result.setDeviceList(deviceList);
+ }
+ }
+
+ MPJLambdaWrapper<Visits> visitQuery = new MPJLambdaWrapper<>();
+ visitQuery.selectAll(Visits.class);
+ visitQuery.eq(Visits::getParentId,result.getId());
+ visitQuery.isNotNull(Visits::getParentId);
+ visitQuery.eq(Visits::getIsdeleted,Constants.ZERO);
+ List<Visits> visitsList = visitsJoinMapper.selectList(visitQuery);
+ Visits v = new Visits();
+ BeanUtils.copyProperties(result,v);
+ visitsList.add(0,v);
+ result.setWithUserList(visitsList);
+ return result;
}
@Override
@@ -273,147 +555,25 @@
@Override
public PageData<Visits> findPage(PageWrap<Visits> pageWrap) {
IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Visits> queryWrapper = new QueryWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Visits::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Visits::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Visits::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Visits::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Visits::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Visits::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Visits::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Visits::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Visits::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(Visits::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(Visits::getCompanyId, pageWrap.getModel().getCompanyId());
- }
- if (pageWrap.getModel().getFaceImg() != null) {
- queryWrapper.lambda().eq(Visits::getFaceImg, pageWrap.getModel().getFaceImg());
- }
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(Visits::getImgurl, pageWrap.getModel().getImgurl());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Visits::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Visits::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getBirthday() != null) {
- queryWrapper.lambda().ge(Visits::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
- queryWrapper.lambda().le(Visits::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
- }
- if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(Visits::getPhone, pageWrap.getModel().getPhone());
- }
- if (pageWrap.getModel().getCompanyName() != null) {
- queryWrapper.lambda().eq(Visits::getCompanyName, pageWrap.getModel().getCompanyName());
- }
- if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().eq(Visits::getIdcardNo, pageWrap.getModel().getIdcardNo());
- }
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Visits::getCode, pageWrap.getModel().getCode());
- }
- if (pageWrap.getModel().getClasses() != null) {
- queryWrapper.lambda().eq(Visits::getClasses, pageWrap.getModel().getClasses());
- }
- if (pageWrap.getModel().getMemberNum() != null) {
- queryWrapper.lambda().eq(Visits::getMemberNum, pageWrap.getModel().getMemberNum());
- }
- if (pageWrap.getModel().getStarttime() != null) {
- queryWrapper.lambda().ge(Visits::getStarttime, Utils.Date.getStart(pageWrap.getModel().getStarttime()));
- queryWrapper.lambda().le(Visits::getStarttime, Utils.Date.getEnd(pageWrap.getModel().getStarttime()));
- }
- if (pageWrap.getModel().getEndtime() != null) {
- queryWrapper.lambda().ge(Visits::getEndtime, Utils.Date.getStart(pageWrap.getModel().getEndtime()));
- queryWrapper.lambda().le(Visits::getEndtime, Utils.Date.getEnd(pageWrap.getModel().getEndtime()));
- }
- if (pageWrap.getModel().getReason() != null) {
- queryWrapper.lambda().eq(Visits::getReason, pageWrap.getModel().getReason());
- }
- if (pageWrap.getModel().getDoorSelect() != null) {
- queryWrapper.lambda().eq(Visits::getDoorSelect, pageWrap.getModel().getDoorSelect());
- }
- if (pageWrap.getModel().getDoors() != null) {
- queryWrapper.lambda().eq(Visits::getDoors, pageWrap.getModel().getDoors());
- }
- if (pageWrap.getModel().getReceptMemberId() != null) {
- queryWrapper.lambda().eq(Visits::getReceptMemberId, pageWrap.getModel().getReceptMemberId());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Visits::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getCheckorId() != null) {
- queryWrapper.lambda().eq(Visits::getCheckorId, pageWrap.getModel().getCheckorId());
- }
- if (pageWrap.getModel().getCheckDate() != null) {
- queryWrapper.lambda().ge(Visits::getCheckDate, Utils.Date.getStart(pageWrap.getModel().getCheckDate()));
- queryWrapper.lambda().le(Visits::getCheckDate, Utils.Date.getEnd(pageWrap.getModel().getCheckDate()));
- }
- if (pageWrap.getModel().getCheckInfo() != null) {
- queryWrapper.lambda().eq(Visits::getCheckInfo, pageWrap.getModel().getCheckInfo());
- }
- if (pageWrap.getModel().getEndCheckorId() != null) {
- queryWrapper.lambda().eq(Visits::getEndCheckorId, pageWrap.getModel().getEndCheckorId());
- }
- if (pageWrap.getModel().getEndCheckDate() != null) {
- queryWrapper.lambda().ge(Visits::getEndCheckDate, Utils.Date.getStart(pageWrap.getModel().getEndCheckDate()));
- queryWrapper.lambda().le(Visits::getEndCheckDate, Utils.Date.getEnd(pageWrap.getModel().getEndCheckDate()));
- }
- if (pageWrap.getModel().getEndCheckInfo() != null) {
- queryWrapper.lambda().eq(Visits::getEndCheckInfo, pageWrap.getModel().getEndCheckInfo());
- }
- if (pageWrap.getModel().getIdcardType() != null) {
- queryWrapper.lambda().eq(Visits::getIdcardType, pageWrap.getModel().getIdcardType());
- }
- if (pageWrap.getModel().getCarNos() != null) {
- queryWrapper.lambda().eq(Visits::getCarNos, pageWrap.getModel().getCarNos());
- }
- if (pageWrap.getModel().getParentId() != null) {
- queryWrapper.lambda().eq(Visits::getParentId, pageWrap.getModel().getParentId());
- }
- if (pageWrap.getModel().getUserAnswerId() != null) {
- queryWrapper.lambda().eq(Visits::getUserAnswerId, pageWrap.getModel().getUserAnswerId());
- }
- if (pageWrap.getModel().getHkId() != null) {
- queryWrapper.lambda().eq(Visits::getHkId, pageWrap.getModel().getHkId());
- }
- if (pageWrap.getModel().getHkStatus() != null) {
- queryWrapper.lambda().eq(Visits::getHkStatus, pageWrap.getModel().getHkStatus());
- }
- if (pageWrap.getModel().getHkDate() != null) {
- queryWrapper.lambda().ge(Visits::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
- queryWrapper.lambda().le(Visits::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
- }
- if (pageWrap.getModel().getErpId() != null) {
- queryWrapper.lambda().eq(Visits::getErpId, pageWrap.getModel().getErpId());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(visitsMapper.selectPage(page, queryWrapper));
+ MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
+
+ queryWrapper.selectAll(Visits.class);
+ queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
+ 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::getParentId);
+ queryWrapper.orderByDesc(Visits::getCreateDate);
+ IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);
+ return PageData.from(result);
}
@Override
@@ -421,4 +581,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);
+ }
+
}
--
Gitblit v1.9.3