From e2f8fb1fbe26ba6d92f3e5dfcaeb0c69abe76b25 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 14:28:57 +0800
Subject: [PATCH] 海康接口对接开发

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java |  381 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 380 insertions(+), 1 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 3a1460e..c3f0a31 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
@@ -1,36 +1,412 @@
 package com.doumee.service.business.impl;
 
+import cn.hutool.core.util.IdcardUtil;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+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.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.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 org.apache.commons.lang3.StringUtils;
 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.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
  * 璁垮鐢宠淇℃伅琛⊿ervice瀹炵幇
  * @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
  */
 @Service
 public class VisitsServiceImpl implements VisitsService {
 
     @Autowired
     private VisitsMapper visitsMapper;
+    @Autowired
+    private DeviceRoleMapper deviceRoleMapper;
+    @Autowired
+    private ProblemLogMapper problemLogMapper ;
+    @Autowired
+    private MemberMapper memberMapper ;
 
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
     @Override
     public Integer create(Visits visits) {
         visitsMapper.insert(visits);
         return visits.getId();
+    }
+
+    /**
+     * 鏅�氳瀹㈢敵璇�
+     * @param visits
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public Integer createFk(Visits visits) {
+        isValidBaseParam(visits);
+        //妫�鏌ユ槸鍚﹀繀椤荤瓟棰橈紝骞朵笖绗﹀悎绛旈瑕佹眰
+        ProblemLog problemLog = isValidProblemLog(visits);
+        //鑾峰彇鐢宠鐨勬捣搴疯闂棬绂佺粍淇℃伅
+        String[] hkIds = getHkDeviceRoles(visits);
+        //妫�楠屾嫓璁夸汉鏄惁鍚堟硶
+        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);
+        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())
+                ||  StringUtils.isBlank( visits.getName())
+                ||  StringUtils.isBlank( visits.getPhone())
+                ||  visits.getIdcardType() == null
+                ||  StringUtils.isBlank( visits.getFaceImg() )
+                ||  StringUtils.isBlank( visits.getIdcardNo() )
+                || visits.getReceptMemberId() == null){
+            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(), "瀵逛笉璧凤紝棰勭害缁撴潫鏃堕棿蹇呴』澶т簬寮�濮嬫椂闂达紒");//
+        }
+    }
+    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 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) {
+        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(visits.getSex());
+            // 鏂板璁垮璁板綍
+            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(visits.getSex());
+            // 鏇存柊璁垮淇℃伅,
+            editList.add(member);
+        }
+        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) {
+        if(withUserList!= null && withUserList .size()>0){
+            for(Visits model:withUserList){
+
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 濡傛灉鏈夌瓟棰樿褰曪紝鏇存柊绛旈璁板綍鍏宠仈鏁版嵁
+     * @param visits
+     * @param problemLog
+     * @param member
+     */
+
+    private void updateProblemLog(Visits visits, ProblemLog problemLog,Member member) {
+        if(problemLog!=null){
+            problemLog.setEditDate(visits.getCreateDate());
+            problemLog.setName(visits.getName());
+            problemLog.setUserId(member.getId());
+            problemLog.setPhone(member.getPhone());
+            problemLog.setLogId(visits.getId());
+            problemLogMapper.updateById(problemLog);
+        }
+    }
+
+    /**
+     *   妫�鏌ヨ浜烘槸鍚﹀悎娉�
+     * @param receptMemberId
+     */
+    private Member isValideVisitedUser(Integer receptMemberId) {
+        Member member = memberMapper.selectById(receptMemberId);
+        if(member == null || Constants.equalsInteger(Constants.ZERO,member.getIsdeleted())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ユ嫓璁夸汉鏆傛椂涓嶈兘鎺ュ彈鎮ㄧ殑鎷滆鐢宠锛�");
+        }
+        if(!Constants.equalsInteger(member.getStatus(), Constants.ZERO)){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ユ嫓璁夸汉鏆傛椂涓嶈兘鎺ュ彈鎮ㄧ殑鎷滆鐢宠.");
+        }
+        if(!Constants.equalsInteger(Constants.ONE, member.getCanVisit())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇ユ嫓璁夸汉鏆傛椂涓嶈兘鎺ュ彈鎮ㄧ殑鎷滆鐢宠~");
+        }
+        return  member;
+    }
+
+    private ProblemLog isValidProblemLog(Visits visits) {
+        String required = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROBLEM_VISIT_REQUIRED).getCode();
+        if(StringUtils.equals(required,Constants.ONE+"")){
+            //濡傛灉蹇呴』绛旈锛屾煡鎵剧瓟棰樿褰�
+            if(visits.getUserAnswerId() == null){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇峰厛鎸夎姹傝繘琛屽畨鍏ㄧ煡璇嗙瓟棰橈紒");
+            }
+            ProblemLog log = problemLogMapper.selectById(visits.getUserAnswerId());
+            if(log == null){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇峰厛鎸夎姹傝繘琛屽畨鍏ㄧ煡璇嗙瓟棰�.");
+            }
+            if(log.getLogId() !=null){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇峰厛鎸夎姹傝繘琛屽畨鍏ㄧ煡璇嗙瓟棰榽");
+            }
+            return  log;
+        }
+        return null;
+    }
+
+    /**
+     * 鑾峰彇鐢宠鐨勬捣搴疯闂棬绂佺粍淇℃伅
+     * @param visits
+     * @return
+     */
+    private String[] getHkDeviceRoles(Visits visits) {
+        String mustSelectDoors = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SELECT_DOORS_VISIT_REQUIRED).getCode();
+        List<DeviceRole> roles = null;
+        if(StringUtils.equals(mustSelectDoors,Constants.ZERO+"")){
+            //濡傛灉蹇呴』閫夋嫨闂ㄧ锛屼絾鏈�夋嫨
+            if(StringUtils.isBlank(visits.getDoors())){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇烽�夋嫨璁块棶闂ㄧ锛�");
+            }
+            //鏍¢獙闂ㄧ缁勪俊鎭槸鍚︽纭�
+            String[] dIds = visits.getDoors().split(",");
+            roles = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+                    .eq(DeviceRole::getIsdeleted,Constants.ZERO)
+                    .eq(DeviceRole::getType,Constants.DeviceRoleType.fk)
+                    .in(DeviceRole::getId, Arrays.asList(dIds)));
+            if(roles == null || roles.size()==0 || roles.size() != dIds.length){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇烽�夋嫨鏈夋晥璁块棶闂ㄧ锛�");
+            }
+        }else{
+            //濡傛灉璁剧疆涓嶉�夋嫨闂ㄧ锛屽垯鎻愪緵榛樿闂ㄧ缁勪俊鎭�
+            String[] dIds = visits.getDoors().split(",");
+            roles = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+                    .eq(DeviceRole::getIsdeleted,Constants.ZERO)
+                    .eq(DeviceRole::getIsDefault,Constants.ZERO)
+                    .eq(DeviceRole::getType,Constants.DeviceRoleType.fk));
+            if(roles.size() ==0){
+
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏆備笉瀛樺湪鍙闂殑璁垮闂ㄧ锛屾棤娉曡繘琛岀敵璇锋搷浣滐紒");
+            }
+        }
+        String[] ids =new String[roles.size()];
+        for (int i = 0; i < roles.size(); i++) {
+            ids[i] = roles.get(i).getHkId();
+        }
+        return  ids;
     }
 
     @Override
@@ -217,6 +593,9 @@
             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());

--
Gitblit v1.9.3