From a30647d4ab84bdffa96cc94a845005c7fa8b8e25 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 六月 2025 11:42:11 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index d135f18..3e23799 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1285,7 +1285,7 @@
return BigDecimal.ZERO;
}
if(platformLogList!=null && platformLogList.size()>0){
- return this.getWorkTime(totalAmount,platformLogList);
+ return this.getWorkTime(totalAmount,platformLogList,today);
}
return r;
}
@@ -1302,7 +1302,7 @@
return BigDecimal.ZERO;
}
if(platformLogList!=null && platformLogList.size()>0){
- return this.getWorkTime(totalAmount,platformLogList);
+ return this.getWorkTime(totalAmount,platformLogList,today);
}
return r;
}
@@ -1313,15 +1313,19 @@
* @param platformLogList
* @return
*/
- public BigDecimal getWorkTime(BigDecimal totalAmount,List<PlatformLog> platformLogList){
+ public BigDecimal getWorkTime(BigDecimal totalAmount,List<PlatformLog> platformLogList,String today){
if(CollectionUtils.isEmpty(platformLogList)){
return BigDecimal.ZERO;
}
//鑾峰彇寮�濮嬫椂闂�
- List<Long> startTimeList = platformLogList.stream().filter(i->Objects.nonNull(i.getParam1())).map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam1()).getTime()).collect(Collectors.toList());
+ List<Long> startTimeList = platformLogList.stream().filter(i->Objects.nonNull(i.getParam1()))
+ .filter(i->DateUtil.formatDate(null,i.getParam1()).equals(today))
+ .map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam1()).getTime()).collect(Collectors.toList());
Long startTime = Collections.min(startTimeList);
//鑾峰彇缁撴潫鏃堕棿
- List<Long> endTimeList = platformLogList.stream().filter(i->Objects.nonNull(i.getParam2())).map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam2()).getTime()).collect(Collectors.toList());
+ List<Long> endTimeList = platformLogList.stream()
+ .filter(i->Objects.nonNull(i.getParam2())&&DateUtil.formatDate(null,i.getParam2()).equals(today))
+ .map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam2()).getTime()).collect(Collectors.toList());
Long endTime = Collections.max(endTimeList);
if(Objects.isNull(startTime)
|| Objects.isNull(endTime) || (startTime>=endTime)){
--
Gitblit v1.9.3