From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +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/JkKeysServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
index e80144f..2408fa3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
@@ -76,6 +76,7 @@
jkKeys.setEditor(loginUserInfo.getId());
jkKeys.setIsdeleted(Constants.ZERO);
jkKeys.setStatus(Constants.ZERO);
+ jkKeys.setCarCode(cars.getCode());
jkKeysMapper.insert(jkKeys);
return jkKeys.getId();
}
@@ -136,6 +137,7 @@
LoginUserInfo loginUserInfo = jkKeys.getLoginUserInfo();
jkKeys.setEditDate(new Date());
jkKeys.setEditor(loginUserInfo.getId());
+ jkKeys.setCarCode(cars.getCode());
jkKeysMapper.updateById(jkKeys);
}
@@ -162,8 +164,16 @@
@Override
public List<JkKeys> findList(JkKeys jkKeys) {
+
+
+
+
+ jkKeys.setIsdeleted(Constants.ZERO);
QueryWrapper<JkKeys> wrapper = new QueryWrapper<>(jkKeys);
- return jkKeysMapper.selectList(wrapper);
+ return jkKeysMapper.selectList(new QueryWrapper<JkKeys>()
+ .lambda().eq(JkKeys::getIsdeleted,Constants.ZERO)
+
+ );
}
@Override
@@ -180,6 +190,7 @@
.leftJoin(JkCabinetGrid.class,JkCabinetGrid::getKeyId,JkKeys::getId)
.leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
.eq(JkKeys::getIsdeleted,Constants.ZERO)
+ .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
.like(StringUtils.isNotBlank(model.getCode()),JkKeys::getCode,model.getCode())
.like(StringUtils.isNotBlank(model.getCarCode()),JkKeys::getCarCode,model.getCode());
IPage<JkKeys> iPage = jkKeysMapper.selectJoinPage(page,JkKeys.class,wrapper);
--
Gitblit v1.9.3