From 74c7d32b4339d241af18b33b3691dc912256306c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 29 五月 2024 18:36:50 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 7c124a7..63bf0b8 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
@@ -258,6 +258,7 @@
     @Override
     @Transactional(rollbackFor = {BusinessException.class,Exception.class})
     public Integer visitReporting(Visits visits) {
+        visits.setSourceType(Constants.ZERO);
         isValidBaseParam(visits);
         //妫�楠岃鎷滆浜烘槸鍚﹀悎娉�
         Member visitMember = isValideVisitedUser(visits.getMemberId());
@@ -271,7 +272,7 @@
         visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode()));
         visits.setIdcardNo(DESUtil.decrypt(Constants.EDS_PWD, visitMember.getIdcardNo()));
         //鍒濆鍖栬瀹俊鎭�
-        initVisitInfo(visits,date);
+//        initVisitInfo(visits,date);
         visitsMapper.insert(visits);
         return visits.getId();
     }
@@ -607,12 +608,17 @@
                 ||  StringUtils.isBlank( visits.getName())
                 ||  StringUtils.isBlank( visits.getPhone())
                 ||  StringUtils.isBlank( visits.getCompanyName())
-                ||  visits.getIdcardType() == null
                 ||  Objects.isNull(visits.getType())
 //                ||  StringUtils.isBlank( visits.getFaceImg() )
-                ||  StringUtils.isBlank( visits.getIdcardNo() )
                 || visits.getReceptMemberId() == null){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
+        }
+        if(Constants.equalsInteger(visits.getType(),Constants.ZERO)
+             ||  Constants.equalsInteger(visits.getType(),Constants.ONE)){
+            if(  visits.getIdcardType() == null
+                    ||  StringUtils.isBlank( visits.getIdcardNo() ) ){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
+            }
         }
         //璁垮鎶ュ
         if(visits.getType().equals(Constants.TWO)
@@ -620,10 +626,10 @@
                 ||  StringUtils.isBlank( visits.getPhone())
                 ||  StringUtils.isBlank( visits.getCompanyName()))
                 ||  StringUtils.isBlank( visits.getCarNos())
+                ||  Objects.isNull(visits.getReceptMemberId())
         ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
         }else if(visits.getType().equals(Constants.ONE) && StringUtils.isBlank(visits.getConstructionReason())){
-
             throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈~鍐欐柦宸ヤ簨鐢憋紒");
         }
         if(visits.getEndtime().getTime() < System.currentTimeMillis()){

--
Gitblit v1.9.3