From 145dbc2a4f5bafcb432fb35d7bc91101aa3318d8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 13 十月 2025 10:15:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkLineServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkLineServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkLineServiceImpl.java
index 21ef83c..1b1f6cb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkLineServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkLineServiceImpl.java
@@ -147,10 +147,32 @@
@Override
public List<JkLine> findList(JkLine jkLine) {
+
+ MPJLambdaWrapper<JkLine> queryWrapper = new MPJLambdaWrapper<>();
jkLine.setIsdeleted(Constants.ZERO);
- QueryWrapper<JkLine> wrapper = new QueryWrapper<>(jkLine);
- wrapper.lambda().orderByAsc(JkLine::getCode);
- return jkLineMapper.selectList(wrapper);
+ queryWrapper.selectAll(JkLine.class )
+ .selectAs(Member::getName,JkLine::getMemberName)
+ .selectAs(Cars::getCode,JkLine::getCarCode)
+ .leftJoin(Cars.class,Cars::getId,JkLine::getCarId )
+ .leftJoin(Member.class,Member::getId,Cars::getMemberId );
+ jkLine.setIsdeleted(Constants.ZERO);
+ if (jkLine.getIsdeleted() != null) {
+ queryWrapper.eq(JkLine::getIsdeleted, jkLine.getIsdeleted());
+ }
+ if (jkLine.getCategoryId() != null) {
+ queryWrapper.eq(JkLine::getCategoryId, jkLine.getCategoryId());
+ }
+ if (jkLine.getCarId() != null) {
+ queryWrapper.eq(JkLine::getCarId, jkLine.getCarId());
+ }
+ if (jkLine.getStatus() != null) {
+ queryWrapper.eq(JkLine::getStatus, jkLine.getStatus());
+ }
+ if (jkLine.getSortnum() != null) {
+ queryWrapper.eq(JkLine::getSortnum, jkLine.getSortnum());
+ }
+ queryWrapper.orderByAsc(JkLine::getCode);
+ return jkLineMapper.selectJoinList(JkLine.class,queryWrapper);
}
@Override
--
Gitblit v1.9.3