From 2c4ea94474ce8f9eb48b71fb9960a7da45320282 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 06 五月 2025 13:58:46 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 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 53983ed..8cf3245 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
@@ -128,6 +128,8 @@
     @Autowired
     private InoutDayCountMapper inoutDayCountMapper;
     @Autowired
+    private InoutRecordMapper inoutRecordMapper;
+    @Autowired
     private CarEventMapper carEventMapper;
 
     @Autowired
@@ -1809,10 +1811,14 @@
                     .apply(" DATE(TIME_INFO) = CURDATE()  ")
                     .last(" limit 1 ")
             );
-
+ 
             //浠婃棩鍦ㄥ洯浜烘暟
             pcWorkPlatformDataVO.setTodayInParkUserNum(
-                    retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
+                    inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
+                            .isNotNull(InoutRecord::getMemberPhone)
+                            .isNull(InoutRecord::getCarCode)
+                            .apply( " DATE(TIME_INFO) = CURDATE() " ))
+                    //retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
             );
 
             pcWorkPlatformDataVO.setTodayInUserNum(Constants.ZERO);
@@ -1820,8 +1826,13 @@
 
             //鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�
             pcWorkPlatformDataVO.setInParkLwUserNum(
-                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)
-                            && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
+                    inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
+                            .eq(InoutRecord::getMemberType,Constants.TWO)
+                            .isNotNull(InoutRecord::getMemberPhone)
+                            .isNull(InoutRecord::getCarCode)
+                            .apply( " DATE(TIME_INFO) = CURDATE() " ))
+//                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)
+//                            && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
             );
             pcWorkPlatformDataVO.setLwUserInNum(Constants.ZERO);
             pcWorkPlatformDataVO.setLwUserOutNum(Constants.ZERO);
@@ -1829,14 +1840,30 @@
 
             //鍦ㄥ洯璁垮鏁伴噺
             pcWorkPlatformDataVO.setInParkVisitUserNum(
-                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()
+                    inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
+                            .eq(InoutRecord::getMemberType,Constants.ZERO)
+                            .isNotNull(InoutRecord::getMemberPhone)
+                            .isNull(InoutRecord::getCarCode)
+                            .apply( " DATE(TIME_INFO) = CURDATE() " ))
+                    //retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()
             );
             pcWorkPlatformDataVO.setVisitUserNum(Constants.ZERO);
             pcWorkPlatformDataVO.setSignLevelNum(Constants.ZERO);
 
+            //鍦ㄥ洯璐ц繍杞﹁締鍙告満
+            pcWorkPlatformDataVO.setInParkDriverUserNum(inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
+                    .eq(InoutRecord::getMemberType,Constants.THREE)
+                    .isNotNull(InoutRecord::getMemberPhone)
+                    .isNull(InoutRecord::getCarCode)
+                    .apply( " DATE(TIME_INFO) = CURDATE() " )));
+
             //鍦ㄥ洯杞﹁締
             pcWorkPlatformDataVO.setTodayInParkCarNum(
-                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
+                    inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
+                            .isNotNull(InoutRecord::getCarCode)
+                            .isNull(InoutRecord::getMemberPhone)
+                            .apply( " DATE(TIME_INFO) = CURDATE() " ))
+                    //retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
             );
             pcWorkPlatformDataVO.setTodayInCarNum(Constants.ZERO);
             pcWorkPlatformDataVO.setTodayOutCarNum(Constants.ZERO);

--
Gitblit v1.9.3