From a450d83f31b91b7504c82c37293a5b96e072664d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 17 十二月 2024 09:19:31 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 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 9a097fd..2876618 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
@@ -1409,17 +1409,29 @@
                             memberId)
             );
 //        }
+        if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)){
+            Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId())
+                    .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
+                    .eq(Notices::getUserId,memberId)
+                    .eq(Notices::getSendacopy,Constants.ZERO)
+                    .last(" limit 1 ")
+            );
+            visitDetailVO.setInfoStatus(1);
+            if(Objects.nonNull(notices)){
+                visitDetailVO.setInfo(notices.getInfo());
+            }else{
+                visitDetailVO.setInfo("鏆傛棤");
+            }
+        }else if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.noPass)){
+            visitDetailVO.setInfoStatus(Constants.VisitStatus.noPass);
+            visitDetailVO.setInfo("瀹℃壒鏈�氳繃");
 
-        Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId())
-                .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
-                        .eq(Notices::getUserId,memberId)
-                        .eq(Notices::getSendacopy,Constants.ZERO)
-                .last(" limit 1 ")
-        );
-        if(Objects.nonNull(notices)){
-            notices.setInfo(notices.getInfo());
+        }else if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.cancel)){
+            visitDetailVO.setInfoStatus(Constants.VisitStatus.cancel);
+            visitDetailVO.setInfo("宸插彇娑�");
         }else{
-            notices.setInfo("鏆傛棤");
+            visitDetailVO.setInfoStatus(Constants.VisitStatus.pass);
+            visitDetailVO.setInfo("瀹℃壒宸查�氳繃");
         }
         return visitDetailVO;
     }
@@ -1797,7 +1809,7 @@
                 SmsEmailServiceImpl.sendVisitTimeOutSms(systemDictDataBiz,
                         emayService,smsEmailMapper,smsConfigMapper,
                         SmsConstants.visitContent.visitTimeOutSignOutNum,
-                        visitReportTimeCount.toString(),Arrays.asList(mobile.split(","))
+                        visitTimeCount.toString(),Arrays.asList(mobile.split(","))
                 );
             }
         }

--
Gitblit v1.9.3