From 44ff584e5dcb3a066d70e4eaaf9f098440a1a5f7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 20 十一月 2025 12:07:43 +0800
Subject: [PATCH] 钥匙柜大屏
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
index b988651..1c2c767 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
@@ -356,7 +356,7 @@
@Override
public List<InterestedListVO> getKeyUseStatistics(Integer type){
- List<String> weekDays = DateUtil.getBeforDays(new Date(),Objects.isNull(type)||Constants.equalsInteger(type,Constants.ZERO)?7:15);
+ List<String> weekDays = DateUtil.getBeforDaysByFormat(new Date(),Objects.isNull(type)||Constants.equalsInteger(type,Constants.ZERO)?7:15,"MM鏈坉d鏃�");
MPJLambdaWrapper<JkCabinetLog> wrapper = new MPJLambdaWrapper<JkCabinetLog>()
.selectAll(JkCabinetLog.class)
.selectAs(Member::getName,JkCabinetLog::getMemberName)
@@ -374,7 +374,7 @@
.eq(JkCabinetLog::getIsdeleted, Constants.ZERO)
.eq(JkCabinetLog::getType,Constants.ONE)
.ne(JkCabinetLog::getKeyStatus,Constants.ZERO)
- .apply(" CREATE_DATE > CURDATE() - INTERVAL "+(Objects.isNull(type)||Constants.equalsInteger(type,Constants.ZERO)?7:15)+" DAY ")
+ .apply(" t.CREATE_DATE > CURDATE() - INTERVAL "+(Objects.isNull(type)||Constants.equalsInteger(type,Constants.ZERO)?7:15)+" DAY ")
.orderByDesc(JkCabinetLog::getCreateDate);
List<JkCabinetLog> jkCabinetLogs = jkCabinetLogMapper.selectJoinList(JkCabinetLog.class,wrapper);
List<InterestedListVO> list = new ArrayList<>();
@@ -386,14 +386,15 @@
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jkCabinetLogs)) {
vo.setNum(
jkCabinetLogs.stream().filter(i->Constants.equalsInteger(i.getKeyStatus(),Constants.TWO)
- &&DateUtil.dateToString(i.getCreateDate(),"yyyy-MM-dd").equals(days))
+ &&DateUtil.dateToString(i.getCreateDate(),"MM鏈坉d鏃�").equals(days))
.collect(Collectors.toList()).size()
);
vo.setNextNum(jkCabinetLogs.stream().filter(i->Constants.equalsInteger(i.getKeyStatus(),Constants.ONE)
- &&DateUtil.dateToString(i.getCreateDate(),"yyyy-MM-dd").equals(days))
+ &&DateUtil.dateToString(i.getCreateDate(),"MM鏈坉d鏃�").equals(days))
.collect(Collectors.toList()).size());
}
+ list.add(vo);
}
return list;
}
--
Gitblit v1.9.3