From cc3c6537dcd5bc7b8eb98046dfcaf0ad93484d60 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 20 十一月 2025 16:12:20 +0800
Subject: [PATCH] 钥匙柜大屏
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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..8470d37 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
@@ -329,7 +329,7 @@
.eq(JkCabinetLog::getIsdeleted, Constants.ZERO)
.eq(JkCabinetLog::getType,Constants.ONE)
.eq(JkCabinetLog::getKeyStatus,Constants.TWO)
- .like(StringUtils.isNotBlank(dto.getCarCode()),JkCabinetLog::getCarCode,dto.getCarCode())
+ .like(StringUtils.isNotBlank(dto.getCarCode()),JkKeys::getCarCode,dto.getCarCode())
.isNotNull(Objects.nonNull(dto.getStatus())&&Constants.equalsInteger(dto.getStatus(),Constants.ONE),JkCabinetLog::getCloseLogId)
.isNull(Objects.nonNull(dto.getStatus())&&Constants.equalsInteger(dto.getStatus(),Constants.ZERO),JkCabinetLog::getCloseLogId)
.orderByDesc(JkCabinetLog::getCreateDate);
@@ -339,7 +339,7 @@
for (JkCabinetLog jkCabinetLog:jkCabinetLogs) {
CabinetBoardUseRecordVO cabinetBoardUseRecordVO = new CabinetBoardUseRecordVO();
BeanUtil.copyProperties(jkCabinetLog,cabinetBoardUseRecordVO);
- cabinetBoardUseRecordVO.setStatus(Objects.nonNull(jkCabinetLog.getReturnDate())?Constants.ZERO:Constants.ONE);
+ cabinetBoardUseRecordVO.setStatus(Objects.nonNull(jkCabinetLog.getReturnDate())?Constants.ONE:Constants.ZERO);
cabinetBoardUseRecordVO.setRemark(Objects.isNull(jkCabinetLog.getOpenWay())?"":
Constants.equalsInteger(jkCabinetLog.getOpenWay(),Constants.ZERO)?"闅忚溅棰嗗彇":
Constants.equalsInteger(jkCabinetLog.getOpenWay(),Constants.ONE)?"闅忔淳杞﹀崟棰嗗彇":"淇濇磥棰嗗彇"
@@ -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