From fad0704afaf4ed07963d267142cc6f625a09909d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 六月 2026 18:32:05 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 1afb5ca..993bdae 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
@@ -4,7 +4,6 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingTalk.DingTalk;
-import com.doumee.core.dingTalk.DingTalkStream;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.jiandaoyun.api.arch.DeptApiClient;
@@ -1189,6 +1188,7 @@
.selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
.selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
.selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
+ .selectAs(JkKeys::getCarId,JkCabinetGrid::getCarId)
.leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
.leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
.eq(JkCabinet::getCode,dto.getCode())
@@ -1219,6 +1219,21 @@
.eq(JkKeys::getId,jkCabinetGrid.getKeyId())
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ JkCabinetLog cabinetLog = new JkCabinetLog();
+ 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);
+ cabinetLog.setKeyStatus(Constants.TWO);
+ cabinetLog.setIsNotice(Constants.ZERO);
+ cabinetLog.setInfo("纭欢鍚屾-閽ュ寵涓嶅湪浣�");
+ cabinetLog.setIsdeleted(Constants.ZERO);
+ cabinetLog.setCreateDate(new Date());
+ jkCabinetLogMapper.insert(cabinetLog);
}
}else{
if(!Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
@@ -1227,6 +1242,21 @@
.eq(JkKeys::getId,jkCabinetGrid.getKeyId())
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ JkCabinetLog cabinetLog = new JkCabinetLog();
+ 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);
+ cabinetLog.setKeyStatus(Constants.ONE);
+ cabinetLog.setIsNotice(Constants.ZERO);
+ cabinetLog.setInfo("纭欢鍚屾-閽ュ寵鍦ㄤ綅");
+ cabinetLog.setIsdeleted(Constants.ZERO);
+ cabinetLog.setCreateDate(new Date());
+ jkCabinetLogMapper.insert(cabinetLog);
}
}
// if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
--
Gitblit v1.9.3