From c467370d8741bc05ca7c22d4253c58ac0a979ef5 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 09 六月 2026 09:46:25 +0800
Subject: [PATCH] 功能优化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index 993bdae..617ac0f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -57,6 +57,9 @@
private JkKeysMapper jkKeysMapper;
@Autowired
+ private CarsMapper carsMapper;
+
+ @Autowired
private SystemUserMapper systemUserMapper;
@Autowired
@@ -1220,11 +1223,19 @@
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
JkCabinetLog cabinetLog = new JkCabinetLog();
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
+ JkKeys jkKeys = jkKeysMapper.selectById(jkCabinetGrid.getKeyId());
+ if(Objects.nonNull(jkKeys)){
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkKeys.getCode());
+ Cars cars = carsMapper.selectById(jkCabinetGrid.getCarId());
+ if(Objects.nonNull(cars)){
+ cabinetLog.setMemberId(cars.getMemberId());
+ }
+ }
cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
cabinetLog.setGridId(jkCabinetGrid.getId());
cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
cabinetLog.setCarId(jkCabinetGrid.getCarId());
- cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
cabinetLog.setType(Constants.ONE);
cabinetLog.setStatus(Constants.ZERO);
cabinetLog.setAuthType(3);
@@ -1243,11 +1254,19 @@
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
JkCabinetLog cabinetLog = new JkCabinetLog();
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
+ JkKeys jkKeys = jkKeysMapper.selectById(jkCabinetGrid.getKeyId());
+ if(Objects.nonNull(jkKeys)){
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkKeys.getCode());
+ Cars cars = carsMapper.selectById(jkCabinetGrid.getCarId());
+ if(Objects.nonNull(cars)){
+ cabinetLog.setMemberId(cars.getMemberId());
+ }
+ }
cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
cabinetLog.setGridId(jkCabinetGrid.getId());
cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
cabinetLog.setCarId(jkCabinetGrid.getCarId());
- cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
cabinetLog.setType(Constants.ONE);
cabinetLog.setStatus(Constants.ZERO);
cabinetLog.setAuthType(3);
@@ -1257,6 +1276,14 @@
cabinetLog.setIsdeleted(Constants.ZERO);
cabinetLog.setCreateDate(new Date());
jkCabinetLogMapper.insert(cabinetLog);
+
+ jkCabinetLogMapper.update(null,new UpdateWrapper<JkCabinetLog>().lambda()
+ .set(JkCabinetLog::getCloseLogId,cabinetLog.getId())
+ .eq(JkCabinetLog::getKeyId,cabinetLog.getKeyId())
+ .eq(JkCabinetLog::getType,Constants.ONE)
+ .eq(JkCabinetLog::getKeyStatus,Constants.TWO)
+ .isNull(JkCabinetLog::getCloseLogId));
+
}
}
// if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
--
Gitblit v1.9.3