From 3f1ad3e7d2e81d1bbe88e027de2950a3d14737b7 Mon Sep 17 00:00:00 2001
From: luojian <1327479187@qq.com>
Date: Tue, 31 Dec 2024 15:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E4=BB=B6=E4=BA=BA=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=BA=97=E9=93=BA=E5=9C=B0=E5=9D=80=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=90=88=E5=B9=B6=E3=80=81=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E6=A0=B9=E6=8D=AE=E4=B8=8B=E5=8D=95=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cpxt/biz/domain/BizOrder.java    |  9 ++++++
 .../service/impl/BizDriverServiceImpl.java    |  3 ++
 .../biz/service/impl/BizOrderServiceImpl.java | 30 ++++++-------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java
index a5f17d4..cfceb79 100644
--- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java
+++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java
@@ -2,6 +2,8 @@ package com.cpxt.biz.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -287,4 +289,11 @@ public class BizOrder
 
     /** 备注 */
     private String remark;
+
+    // 下单开始时间
+    @TableField(exist = false)
+    private String beginTime;
+    // 下单结束时间
+    @TableField(exist = false)
+    private String endTime;
 }
diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java
index 8b93ca4..8fc8790 100644
--- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java
+++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java
@@ -73,6 +73,9 @@ public class BizDriverServiceImpl implements IBizDriverService
         if (ObjectUtil.isNotEmpty(bizDriver.getDeptId())){
             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())){
             queryWrapper.like(BizDriver::getName, bizDriver.getName());
         }
diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java
index 7ea73b5..05a4913 100644
--- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java
+++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java
@@ -184,28 +184,10 @@ public class BizOrderServiceImpl implements IBizOrderService {
             queryWrapper.like(BizOrder::getCopilotName, bizOrder.getCopilotName());
         }
         if (ObjectUtil.isNotEmpty(bizOrder.getSenderName())) {
-            queryWrapper.like(BizOrder::getSenderName, 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());
+            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.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())) {
             queryWrapper.like(BizOrder::getReceiverLinkman, bizOrder.getReceiverLinkman());
@@ -303,8 +285,14 @@ public class BizOrderServiceImpl implements IBizOrderService {
         if (ObjectUtil.isNotEmpty(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.eq(BizOrder::getStatus, 1);
         return queryWrapper;
     }