From c8dd2a2afa3e196960e56deea4a190b4b805a3ab Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 25 十二月 2025 15:31:45 +0800
Subject: [PATCH] 功能优化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
index cb579b2..7eaf736 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
@@ -554,25 +554,31 @@
@Override
public TelecomInParkDataVO getInParkDataForTelecom(){
TelecomInParkDataVO telecomInParkDataVO = new TelecomInParkDataVO();
- telecomInParkDataVO.setInCarNum(
- inoutRecordMapper.selectCount(new MPJLambdaWrapper<InoutRecord>()
- .selectAll(InoutRecord.class)
- .eq(InoutRecord::getIsdeleted,Constants.ZERO)
- .eq(InoutRecord::getInOrOut,Constants.ZERO)
- .isNotNull(InoutRecord::getCarCode)
- .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ")
- .groupBy(InoutRecord::getCarCode)
- ).intValue());
+ telecomInParkDataVO.setInCarNum(Constants.ZERO);
+ telecomInParkDataVO.setInUserNum(Constants.ZERO);
+ List<InoutRecord> listCar = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()
+ .eq(InoutRecord::getIsdeleted,Constants.ZERO)
+ .eq(InoutRecord::getInOrOut,Constants.ZERO)
+ .isNotNull(InoutRecord::getCarCode)
+ .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) "));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(listCar)){
+ telecomInParkDataVO.setInCarNum(
+ new HashSet<>(listCar.stream().map(i->i.getCarCode()).collect(Collectors.toList())).size()
+ );
+ }
- telecomInParkDataVO.setInUserNum(
- inoutRecordMapper.selectCount(new MPJLambdaWrapper<InoutRecord>()
- .selectAll(InoutRecord.class)
- .eq(InoutRecord::getIsdeleted,Constants.ZERO)
- .eq(InoutRecord::getInOrOut,Constants.ZERO)
- .isNotNull(InoutRecord::getMemberPhone)
- .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ")
- .groupBy(InoutRecord::getMemberPhone)
- ).intValue());
+
+ List<InoutRecord> listUser = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()
+ .eq(InoutRecord::getIsdeleted,Constants.ZERO)
+ .eq(InoutRecord::getInOrOut,Constants.ZERO)
+ .isNotNull(InoutRecord::getMemberPhone)
+ .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) "));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(listUser)){
+ telecomInParkDataVO.setInUserNum(
+ new HashSet<>(listUser.stream().map(i->i.getMemberPhone()).collect(Collectors.toList())).size()
+ );
+ }
+
return telecomInParkDataVO;
}
--
Gitblit v1.9.3