From 1fb6ce7f165e85cb9458d6e8d1b6bf7debc1e665 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 03 十二月 2025 14:26:37 +0800
Subject: [PATCH] 功能开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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..ae5aab9 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
@@ -140,6 +140,8 @@
.eq(Objects.nonNull(model.getAuthType()),JkCabinetLog::getAuthType,model.getAuthType())
.eq(Objects.nonNull(model.getStatus()),JkCabinetLog::getStatus,model.getStatus())
.eq(Objects.nonNull(model.getType()),JkCabinetLog::getType,model.getType())
+ .ne(Objects.nonNull(model.getBizType())&&Constants.equalsInteger(model.getBizType(),Constants.ONE),JkCabinetLog::getType,Constants.TWO)
+ .eq(Objects.nonNull(model.getBizType())&&Constants.equalsInteger(model.getBizType(),Constants.TWO),JkCabinetLog::getType,Constants.TWO)
.in(Objects.nonNull(model.getType())&&Constants.equalsInteger(model.getType(),Constants.ONE),JkCabinetLog::getType,"1,2")
.eq(JkCabinetLog::getIsdeleted, Constants.ZERO)
.orderByDesc(JkCabinetLog::getCreateDate);
@@ -252,15 +254,14 @@
.last(" limit 1 ")
);
}
-
- String content = "銆愯溅杈�-"+jkCabinetLog.getCarCode()+"閽ュ寵銆戠敱+"+(StringUtils.isNotBlank(jkCabinetLog.getMemberName())?jkCabinetLog.getMemberName():"鏈煡浜哄憳")+"鍊熷嚭锛岃秴鏃舵湭褰掕繕";
-
+ String content = "銆愯溅杈�-"+jkCabinetLog.getKeyInfo()+"閽ュ寵銆戠敱"+(StringUtils.isNotBlank(jkCabinetLog.getMemberName())?jkCabinetLog.getMemberName():"鏈煡浜哄憳")+"鍊熷嚭锛岃秴鏃舵湭褰掕繕";
//瀛樺偍鎶ヨ寮傚父璁板綍
WarningEvent warningEvent = new WarningEvent();
warningEvent.setCreateDate(new Date());
warningEvent.setCreator(Objects.nonNull(systemUser)?systemUser.getId():null);
warningEvent.setWarningId(warning.getId());
warningEvent.setTitle(warningConfig.getInfo());
+ warningEvent.setIsdeleted(Constants.ZERO);
warningEvent.setContent(content );
warningEvent.setStatus(Constants.ZERO);
warningEvent.setRegion( StringUtils.isNotBlank(jkCabinetLog.getLocation())?jkCabinetLog.getLocation():"鏈煡浣嶇疆");
@@ -295,6 +296,10 @@
warningPushMapper.insert(warningPush);
warningEvent.setStatus(Constants.ONE);
warningEventMapper.updateById(warningEvent);
+ jkCabinetLogMapper.update(null,new UpdateWrapper<JkCabinetLog>().lambda()
+ .set(JkCabinetLog::getIsNotice,Constants.ONE)
+ .eq(JkCabinetLog::getId,jkCabinetLog.getId())
+ );
}catch (Exception e){
warningEvent.setStatus(Constants.TWO);
warningEventMapper.updateById(warningEvent);
@@ -329,7 +334,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 +344,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 +361,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-dd");
MPJLambdaWrapper<JkCabinetLog> wrapper = new MPJLambdaWrapper<JkCabinetLog>()
.selectAll(JkCabinetLog.class)
.selectAs(Member::getName,JkCabinetLog::getMemberName)
@@ -374,7 +379,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 +391,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-dd").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-dd").equals(days))
.collect(Collectors.toList()).size());
}
+ list.add(vo);
}
return list;
}
--
Gitblit v1.9.3