From 078a5c4ced367fdbd5a16c27c8bada6e44e632d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 09 十月 2025 16:00:33 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchLineServiceImpl.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchLineServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchLineServiceImpl.java
index becfce2..2aa3ea3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchLineServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchLineServiceImpl.java
@@ -1,15 +1,17 @@
 package com.doumee.service.business.impl;
 
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.*;
 import com.doumee.service.business.third.model.PageData;
 import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.JkSketchLineMapper;
-import com.doumee.dao.business.model.JkSketchLine;
 import com.doumee.service.business.JkSketchLineService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -80,8 +82,21 @@
 
     @Override
     public List<JkSketchLine> findList(JkSketchLine jkSketchLine) {
-        QueryWrapper<JkSketchLine> wrapper = new QueryWrapper<>(jkSketchLine);
-        return jkSketchLineMapper.selectList(wrapper);
+        MPJLambdaWrapper<JkSketchLine> wrapper = new MPJLambdaWrapper<>();
+        wrapper.selectAll(JkSketchLine.class )
+                .selectAs(Member::getName,JkSketchLine::getMemberName)
+                .selectAs(Cars::getCode,JkSketchLine::getCarCode)
+                .selectAs(JkLine::getName,JkSketchLine::getLineName)
+                .selectAs(Category::getId,JkSketchLine::getCategoryId)
+                .selectAs(Category::getName,JkSketchLine::getCategoryName)
+                .leftJoin(JkLine.class,JkLine::getId,JkOrders::getLineId )
+                .leftJoin(Cars.class,Cars::getId,JkLine::getCarId )
+                .leftJoin(Member.class,Member::getId,Cars::getMemberId )
+                .leftJoin(Category.class,Category::getId,JkLine::getCategoryId );
+        wrapper.eq( jkSketchLine.getSketchId()!=null,JkSketchLine::getSketchId, jkSketchLine.getSketchId())
+                .eq(  JkSketchLine::getIsdeleted,Constants.ZERO);
+
+        return jkSketchLineMapper.selectJoinList(JkSketchLine.class,wrapper);
     }
   
     @Override

--
Gitblit v1.9.3