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/JkSketchCustomerServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java
index 338bd2e..f1b3048 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java
@@ -4,6 +4,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.JkCustomerNavigationMapper;
+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;
@@ -37,6 +38,8 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private JkSketchCustomerMapper jkSketchCustomerMapper;
+ @Autowired
+ private JkSketchMapper jkSketchMapper;
@Autowired
private JkCustomerNavigationMapper jkCustomerNavigationMapper;
@@ -187,6 +190,12 @@
}
@Override
public List<JkSketchCustomer> findList(JkSketchCustomer jkSketchCustomer) {
+ /* if(jkSketchCustomer.getSketchId()!=null){
+ JkSketch sketch = jkSketchMapper.selectById(jkSketchCustomer.getSketchId());
+ if(sketch!=null){
+ jkSketchCustomer.setType(Constants.formatIntegerNum(sketch.getOptStatus()));
+ }
+ }*/
MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
jkSketchCustomer.setIsdeleted(Constants.ZERO);
queryWrapper.selectAll(JkSketchCustomer.class )
@@ -198,11 +207,9 @@
.leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId ) ;
queryWrapper.like(jkSketchCustomer.getCode()!=null,JkCustomer::getCode,jkSketchCustomer.getCode());
queryWrapper.like(jkSketchCustomer.getName()!=null,JkCustomer::getName,jkSketchCustomer.getName());
+ queryWrapper.eq(jkSketchCustomer.getType() != null,JkSketchCustomer::getType,jkSketchCustomer.getType());
if (jkSketchCustomer.getId() != null) {
queryWrapper.eq(JkSketchCustomer::getId,jkSketchCustomer.getId());
- }
- if (jkSketchCustomer.getCreator() != null) {
- queryWrapper.eq(JkSketchCustomer::getCreator,jkSketchCustomer.getCreator());
}
if (jkSketchCustomer.getCreateDate() != null) {
queryWrapper.ge(JkSketchCustomer::getCreateDate, Utils.Date.getStart(jkSketchCustomer.getCreateDate()));
@@ -243,6 +250,12 @@
@Override
public PageData<JkSketchCustomer> findPage(PageWrap<JkSketchCustomer> pageWrap) {
+ if(pageWrap.getModel().getSketchId()!=null){
+ JkSketch sketch = jkSketchMapper.selectById(pageWrap.getModel().getSketchId());
+ if(sketch!=null){
+ pageWrap.getModel().setType(Constants.formatIntegerNum(sketch.getOptStatus()));
+ }
+ }
IPage<JkSketchCustomer> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
@@ -258,6 +271,7 @@
.leftJoin(JkSketchLine.class,JkSketchLine::getId,JkSketchCustomer::getSketchLineId )
.leftJoin(JkLine.class,JkLine::getId,JkSketchLine::getLineId )
.leftJoin(Category.class,Category::getId,JkLine::getCategoryId );
+ queryWrapper.eq( pageWrap.getModel().getType()!=null,JkSketchCustomer::getType, pageWrap.getModel().getType());
queryWrapper.eq( pageWrap.getModel().getCategoryId()!=null,JkLine::getCategoryId, pageWrap.getModel().getCategoryId());
queryWrapper.eq( pageWrap.getModel().getDateInfo()!=null,JkSketchCustomer::getDateInfo, pageWrap.getModel().getDateInfo());
queryWrapper.like( pageWrap.getModel().getCode()!=null,JkCustomer::getCode, pageWrap.getModel().getCode());
--
Gitblit v1.9.3