From d941bab56c15b52312c58707ff778f6140e0c5f4 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 11 九月 2024 17:47:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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..316f676 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
@@ -206,7 +206,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(), "瀵逛笉璧凤紝韬唤璇佸彿鐮佹湁璇紝璇锋牳瀹炲悗閲嶈瘯锛�");
}
@@ -1260,6 +1261,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