From 832e40a8249ae15a5b2a7f01c78da4edc06cd55e Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 15:54:57 +0800
Subject: [PATCH] 定时自动叫号 与 WMS获取车辆是否在园接口开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 31 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 c58701d..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
@@ -1,19 +1,23 @@
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.JkSketchCustomerMapper;
-import com.doumee.dao.business.model.JkSketchCustomer;
import com.doumee.service.business.JkSketchCustomerService;
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.RoundingMode;
import java.util.List;
/**
@@ -80,65 +84,124 @@
@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
public PageData<JkSketchCustomer> findPage(PageWrap<JkSketchCustomer> pageWrap) {
IPage<JkSketchCustomer> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<JkSketchCustomer> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.selectAll(JkSketchCustomer.class )
+ .selectAs(JkCustomer::getName,JkSketchCustomer::getName)
+ .selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
+ .selectAs(JkLine::getName,JkSketchCustomer::getLineName)
+ .selectAs(Category::getId,JkSketchCustomer::getCategoryId)
+ .selectAs(Category::getName,JkSketchCustomer::getCategoryName)
+ .leftJoin(JkOrders.class,JkOrders::getId,JkSketchCustomer::getOrderId )
+ .leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )
+ .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.lambda().eq(JkSketchCustomer::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(JkSketchCustomer::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(JkSketchCustomer::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(JkSketchCustomer::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(JkSketchCustomer::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(JkSketchCustomer::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(JkSketchCustomer::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(JkSketchCustomer::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(JkSketchCustomer::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(JkSketchCustomer::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(JkSketchCustomer::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(JkSketchCustomer::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(JkSketchCustomer::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(JkSketchCustomer::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(JkSketchCustomer::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(JkSketchCustomer::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(JkSketchCustomer::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.eq(JkSketchCustomer::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getSketchLineId() != null) {
- queryWrapper.lambda().eq(JkSketchCustomer::getSketchLineId, pageWrap.getModel().getSketchLineId());
+ queryWrapper.eq(JkSketchCustomer::getSketchLineId, pageWrap.getModel().getSketchLineId());
}
if (pageWrap.getModel().getSketchId() != null) {
- queryWrapper.lambda().eq(JkSketchCustomer::getSketchId, pageWrap.getModel().getSketchId());
+ queryWrapper.eq(JkSketchCustomer::getSketchId, pageWrap.getModel().getSketchId());
}
if (pageWrap.getModel().getTotalNum() != null) {
- queryWrapper.lambda().eq(JkSketchCustomer::getTotalNum, pageWrap.getModel().getTotalNum());
+ queryWrapper.eq(JkSketchCustomer::getTotalNum, pageWrap.getModel().getTotalNum());
}
- if (pageWrap.getModel().getOrderNum() != null) {
- queryWrapper.lambda().eq(JkSketchCustomer::getOrderNum, pageWrap.getModel().getOrderNum());
+ if (pageWrap.getModel().getOrderId() != null) {
+ queryWrapper.eq(JkSketchCustomer::getOrderId, pageWrap.getModel().getOrderId());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(JkSketchCustomer::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(JkSketchCustomer::getSortnum, pageWrap.getModel().getSortnum());
}
- if (pageWrap.getModel().getDateInfo() != null) {
- queryWrapper.lambda().ge(JkSketchCustomer::getDateInfo, Utils.Date.getStart(pageWrap.getModel().getDateInfo()));
- queryWrapper.lambda().le(JkSketchCustomer::getDateInfo, Utils.Date.getEnd(pageWrap.getModel().getDateInfo()));
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(jkSketchCustomerMapper.selectPage(page, queryWrapper));
+
+ queryWrapper.orderByAsc(JkSketchCustomer::getSketchLineId,JkSketchCustomer::getSortnum);
+ IPage<JkSketchCustomer> result = jkSketchCustomerMapper.selectJoinPage(page, JkSketchCustomer.class,queryWrapper);
+ return PageData.from(result);
}
@Override
--
Gitblit v1.9.3