yfd
/
cpxt-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

发件人姓名电话店铺地址查询条件合并、加上根据下单时间查询

master
luojian 2024-12-31 15:24:30 +08:00
parent 761bd473cb
commit 3f1ad3e7d2
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java
View File

@ -2,6 +2,8 @@ package com.cpxt.biz.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
@ -287,4 +289,11 @@ public class BizOrder
/** 备注 */ /** 备注 */
private String remark; private String remark;
// 下单开始时间
@TableField(exist = false)
private String beginTime;
// 下单结束时间
@TableField(exist = false)
private String endTime;
} }

3
cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java
View File

@ -73,6 +73,9 @@ public class BizDriverServiceImpl implements IBizDriverService
if (ObjectUtil.isNotEmpty(bizDriver.getDeptId())){ if (ObjectUtil.isNotEmpty(bizDriver.getDeptId())){
queryWrapper.in(BizDriver::getDeptId,sysDeptMapper.selectChildrenDeptById(bizDriver.getDeptId()).stream().map(SysDept::getDeptId).collect(Collectors.toList())); queryWrapper.in(BizDriver::getDeptId,sysDeptMapper.selectChildrenDeptById(bizDriver.getDeptId()).stream().map(SysDept::getDeptId).collect(Collectors.toList()));
} }
if (ObjectUtil.isNotEmpty(bizDriver.getUserId())){
queryWrapper.eq(BizDriver::getUserId, bizDriver.getUserId());
}
if (ObjectUtil.isNotEmpty(bizDriver.getName())){ if (ObjectUtil.isNotEmpty(bizDriver.getName())){
queryWrapper.like(BizDriver::getName, bizDriver.getName()); queryWrapper.like(BizDriver::getName, bizDriver.getName());
} }

30
cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java
View File

@ -184,28 +184,10 @@ public class BizOrderServiceImpl implements IBizOrderService {
queryWrapper.like(BizOrder::getCopilotName, bizOrder.getCopilotName()); queryWrapper.like(BizOrder::getCopilotName, bizOrder.getCopilotName());
} }
if (ObjectUtil.isNotEmpty(bizOrder.getSenderName())) { if (ObjectUtil.isNotEmpty(bizOrder.getSenderName())) {
queryWrapper.like(BizOrder::getSenderName, bizOrder.getSenderName()); queryWrapper.and(wq -> wq.like(BizOrder::getSenderName, bizOrder.getSenderName()).or().like(BizOrder::getSenderPhone,bizOrder.getSenderName()).or().like(BizOrder::getSenderAddress,bizOrder.getSenderName()));
}
if (ObjectUtil.isNotEmpty(bizOrder.getSenderLinkman())) {
queryWrapper.like(BizOrder::getSenderLinkman, bizOrder.getSenderLinkman());
}
if (ObjectUtil.isNotEmpty(bizOrder.getSenderPhone())) {
queryWrapper.like(BizOrder::getSenderPhone, bizOrder.getSenderPhone());
}
if (ObjectUtil.isNotEmpty(bizOrder.getSenderAddress())) {
queryWrapper.like(BizOrder::getSenderAddress, bizOrder.getSenderAddress());
}
if (ObjectUtil.isNotEmpty(bizOrder.getSenderLng())) {
queryWrapper.eq(BizOrder::getSenderLng, bizOrder.getSenderLng());
}
if (ObjectUtil.isNotEmpty(bizOrder.getSenderLat())) {
queryWrapper.eq(BizOrder::getSenderLat, bizOrder.getSenderLat());
}
if (ObjectUtil.isNotEmpty(bizOrder.getSenderCompany())) {
queryWrapper.like(BizOrder::getSenderCompany, bizOrder.getSenderCompany());
} }
if (ObjectUtil.isNotEmpty(bizOrder.getReceiverName())) { if (ObjectUtil.isNotEmpty(bizOrder.getReceiverName())) {
queryWrapper.like(BizOrder::getReceiverName, bizOrder.getReceiverName()); queryWrapper.and(wq -> wq.like(BizOrder::getReceiverName, bizOrder.getReceiverName()).or().like(BizOrder::getReceiverPhone,bizOrder.getReceiverName()).or().like(BizOrder::getReceiverAddress,bizOrder.getReceiverName()));
} }
if (ObjectUtil.isNotEmpty(bizOrder.getReceiverLinkman())) { if (ObjectUtil.isNotEmpty(bizOrder.getReceiverLinkman())) {
queryWrapper.like(BizOrder::getReceiverLinkman, bizOrder.getReceiverLinkman()); queryWrapper.like(BizOrder::getReceiverLinkman, bizOrder.getReceiverLinkman());
@ -303,8 +285,14 @@ public class BizOrderServiceImpl implements IBizOrderService {
if (ObjectUtil.isNotEmpty(bizOrder.getArriveLat())) { if (ObjectUtil.isNotEmpty(bizOrder.getArriveLat())) {
queryWrapper.eq(BizOrder::getArriveLat, bizOrder.getArriveLat()); queryWrapper.eq(BizOrder::getArriveLat, bizOrder.getArriveLat());
} }
queryWrapper.eq(BizOrder::getStatus, 1); if (ObjectUtil.isNotEmpty(bizOrder.getBeginTime())){
queryWrapper.ge(BizOrder::getCreateTime,bizOrder.getBeginTime());
}
if (ObjectUtil.isNotEmpty(bizOrder.getEndTime())){
queryWrapper.le(BizOrder::getCreateTime,bizOrder.getEndTime());
}
queryWrapper.orderByDesc(BizOrder::getCreateTime); queryWrapper.orderByDesc(BizOrder::getCreateTime);
queryWrapper.eq(BizOrder::getStatus, 1);
return queryWrapper; return queryWrapper;
} }