From 9852b16ec51c85fd808dc68b75eadfebd117a27e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 18:27:06 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 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 dd415bf..467a4b4 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
@@ -84,8 +84,58 @@
@Override
public List<JkSketchCustomer> findList(JkSketchCustomer jkSketchCustomer) {
- QueryWrapper<JkSketchCustomer> wrapper = new QueryWrapper<>(jkSketchCustomer);
- return jkSketchCustomerMapper.selectList(wrapper);
+ MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
+ jkSketchCustomer.setIsdeleted(Constants.ZERO);
+ queryWrapper.selectAll(JkSketchCustomer.class )
+ .selectAs(JkCustomer::getName,JkSketchCustomer::getName)
+ .selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
+ .selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
+ .selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
+ .selectAs(JkCustomer::getLocation,JkSketchCustomer::getLocation)
+ .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());
+ 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()));
+ queryWrapper.le(JkSketchCustomer::getCreateDate, Utils.Date.getEnd(jkSketchCustomer.getCreateDate()));
+ }
+ if (jkSketchCustomer.getEditor() != null) {
+ queryWrapper.eq(JkSketchCustomer::getEditor,jkSketchCustomer.getEditor());
+ }
+ if (jkSketchCustomer.getEditDate() != null) {
+ queryWrapper.ge(JkSketchCustomer::getEditDate, Utils.Date.getStart(jkSketchCustomer.getEditDate()));
+ queryWrapper.le(JkSketchCustomer::getEditDate, Utils.Date.getEnd(jkSketchCustomer.getEditDate()));
+ }
+ if (jkSketchCustomer.getIsdeleted() != null) {
+ queryWrapper.eq(JkSketchCustomer::getIsdeleted,jkSketchCustomer.getIsdeleted());
+ }
+ if (jkSketchCustomer.getInfo() != null) {
+ queryWrapper.eq(JkSketchCustomer::getInfo,jkSketchCustomer.getInfo());
+ }
+ if (jkSketchCustomer.getSketchLineId() != null) {
+ queryWrapper.eq(JkSketchCustomer::getSketchLineId,jkSketchCustomer.getSketchLineId());
+ }
+ if (jkSketchCustomer.getSketchId() != null) {
+ queryWrapper.eq(JkSketchCustomer::getSketchId,jkSketchCustomer.getSketchId());
+ }
+ if (jkSketchCustomer.getTotalNum() != null) {
+ queryWrapper.eq(JkSketchCustomer::getTotalNum,jkSketchCustomer.getTotalNum());
+ }
+ if (jkSketchCustomer.getOrderId() != null) {
+ queryWrapper.eq(JkSketchCustomer::getOrderId,jkSketchCustomer.getOrderId());
+ }
+ if (jkSketchCustomer.getSortnum() != null) {
+ queryWrapper.eq(JkSketchCustomer::getSortnum,jkSketchCustomer.getSortnum());
+ }
+
+ queryWrapper.orderByAsc(JkSketchCustomer::getSketchLineId,JkSketchCustomer::getSortnum);
+ return jkSketchCustomerMapper.selectJoinList(JkSketchCustomer.class,queryWrapper);
}
@Override
@@ -102,10 +152,13 @@
.selectAs(Category::getName,JkSketchCustomer::getCategoryName)
.leftJoin(JkOrders.class,JkOrders::getId,JkSketchCustomer::getOrderId )
.leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )
- .leftJoin(JkLine.class,JkLine::getId,JkOrders::getLineId )
+ .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().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());
+ queryWrapper.like( pageWrap.getModel().getName()!=null,JkCustomer::getName, pageWrap.getModel().getName());
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(JkSketchCustomer::getId, pageWrap.getModel().getId());
@@ -146,7 +199,7 @@
queryWrapper.eq(JkSketchCustomer::getSortnum, pageWrap.getModel().getSortnum());
}
- queryWrapper.orderByAsc(JkSketchCustomer::getSketchLineId);
+ queryWrapper.orderByAsc(JkSketchCustomer::getSketchLineId,JkSketchCustomer::getSortnum);
IPage<JkSketchCustomer> result = jkSketchCustomerMapper.selectJoinPage(page, JkSketchCustomer.class,queryWrapper);
return PageData.from(result);
}
--
Gitblit v1.9.3