From 534219a0336019451f1761b279eadce2c32b650b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期日, 28 九月 2025 10:08:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 f4b8bb7..d9ab31f 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
@@ -1902,6 +1902,7 @@
List<String> memberIds = inoutRecordList.stream().filter(i->
Objects.isNull(i.getCarCode())
+ && Constants.equalsInteger(i.getMemberType(),Constants.ONE)
&& Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
&& Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
)
@@ -1917,6 +1918,8 @@
visitVO.setName(days);
+ weekVisitList.add(visitVO);
+
InterestedListVO carVO = new InterestedListVO();
carVO.setNum(Constants.ZERO);
carVO.setName(days);
@@ -1928,7 +1931,7 @@
List<String> carCodeList = inoutRecordList.stream().filter(i->
Objects.nonNull(i.getCarCode())
&& Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
- && Objects.isNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
+ &&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
)
.map(i->i.getCarCode())
.collect(Collectors.toList());
@@ -1937,9 +1940,8 @@
}
}
if(Objects.isNull(carVO.getNum())){
- visitVO.setNum(Constants.ZERO);
+ carVO.setNum(Constants.ZERO);
}
- weekVisitList.add(visitVO);
weekCarList.add(carVO);
}
pcWorkPlatformDataVO.setWeekVisitList(weekVisitList );
--
Gitblit v1.9.3