From cf71cc3aff54707a8f43b2746e3eb16439ec513d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 九月 2024 17:27:42 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index dee709a..83d4203 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -11,7 +11,6 @@
 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.param.BaseResponse;
 import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
 import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
@@ -206,7 +205,8 @@
         getHkDeviceRoles(visits,isERP);
         //妫�楠屾嫓璁夸汉鏄惁鍚堟硶
         Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
-        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&visits.getIdcardNo().length()!=18
+        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())
+                &&visits.getIdcardNo().length()!=18
         ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝韬唤璇佸彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
         }
@@ -1141,6 +1141,15 @@
                         result.getType(),
                         memberId)
         );
+        if(Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.xfSuccess)
+                || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.xfFail)
+                || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.signin)
+                || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.signout)
+                || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.invalid)){
+            result.setBusinessStatus(Constants.VisitStatus.pass);
+        }else{
+            result.setBusinessStatus(result.getStatus());
+        }
 
         return result;
     }
@@ -1260,6 +1269,15 @@
         VisitDetailVO visitDetailVO = new VisitDetailVO();
         visitDetailVO.setCreateTime(visits.getCreateDate());
         visitDetailVO.setStatus(visits.getStatus());
+        if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)
+        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfFail)
+        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signin)
+        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signout)
+        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.invalid)){
+            visitDetailVO.setBusinessStatus(Constants.VisitStatus.pass);
+        }else{
+            visitDetailVO.setBusinessStatus(visits.getStatus());
+        }
         visitDetailVO.setCarNos(visits.getCarNos());
         visitDetailVO.setPhone(visits.getPhone());
         visitDetailVO.setVisitUserName(member.getName());

--
Gitblit v1.9.3