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/JkSketchLineServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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..60529a5 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,18 @@
package com.doumee.service.business.impl;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.JkSketchMapper;
+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;
@@ -26,6 +29,8 @@
@Autowired
private JkSketchLineMapper jkSketchLineMapper;
+ @Autowired
+ private JkSketchMapper jkSketchMapper;
@Override
public Integer create(JkSketchLine jkSketchLine) {
@@ -80,20 +85,49 @@
@Override
public List<JkSketchLine> findList(JkSketchLine jkSketchLine) {
- QueryWrapper<JkSketchLine> wrapper = new QueryWrapper<>(jkSketchLine);
- return jkSketchLineMapper.selectList(wrapper);
+ /* if(jkSketchLine.getSketchId()!=null){
+ JkSketch sketch = jkSketchMapper.selectById(jkSketchLine.getSketchId());
+ if(sketch!=null){
+ jkSketchLine.setType(Constants.formatIntegerNum(sketch.getOptStatus()));
+ }
+ }*/
+ 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)
+ .selectAs(JkLine::getMaxOrder,JkSketchLine::getMaxOrder)
+ .selectAs(JkLine::getMaxCustomer,JkSketchLine::getMaxCustomer)
+ .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.getType()!=null,JkSketchLine::getType, jkSketchLine.getType());
+ wrapper.eq( jkSketchLine.getSketchId()!=null,JkSketchLine::getSketchId, jkSketchLine.getSketchId())
+ .eq( JkSketchLine::getIsdeleted,Constants.ZERO)
+ .orderByAsc(JkLine::getSortnum );
+
+ return jkSketchLineMapper.selectJoinList(JkSketchLine.class,wrapper);
}
@Override
public PageData<JkSketchLine> findPage(PageWrap<JkSketchLine> pageWrap) {
+ if(pageWrap.getModel().getSketchId()!=null){
+ JkSketch sketch = jkSketchMapper.selectById(pageWrap.getModel().getSketchId());
+ if(sketch!=null){
+ pageWrap.getModel().setType(Constants.formatIntegerNum(sketch.getOptStatus()));
+ }
+ }
IPage<JkSketchLine> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<JkSketchLine> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(JkSketchLine::getId, pageWrap.getModel().getId());
}
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(JkSketchLine::getCreator, pageWrap.getModel().getCreator());
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(JkSketchLine::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getCreateDate() != null) {
queryWrapper.lambda().ge(JkSketchLine::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
--
Gitblit v1.9.3