From f42f56c48e7cfcc05b4591430463632c2567dbee Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Wed, 14 Jun 2023 22:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E5=A7=93=E5=90=8D/=E7=94=B5?=
 =?UTF-8?q?=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/order/OrderDetailController.java |  8 ++++++++
 .../main/java/com/ghy/order/domain/OrderDetail.java | 13 +++++++++++++
 .../resources/mapper/order/OrderDetailMapper.xml    |  6 ++++++
 3 files changed, 27 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index a41a66c2..f0c48a87 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -112,6 +112,14 @@ public class OrderDetailController extends BaseController {
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(OrderDetail orderDetail) {
+        if(StringUtils.isNotEmpty(orderDetail.getWorkerName()) || StringUtils.isNotEmpty(orderDetail.getWorkerPhone())){
+            Worker param = new Worker();
+            param.setName(orderDetail.getWorkerName());
+            param.setPhone(orderDetail.getWorkerPhone());
+            List<Worker> workList = workerService.getWorkList(param);
+            List<Long> ids = workList.stream().map(Worker::getWorkerId).collect(Collectors.toList());
+            orderDetail.setWorkerIds(ids);
+        }
         startPage();
         if (this.getSysUser().getDept().getParentId() != 101) {
             orderDetail.setDeptId(this.getSysUser().getDept().getParentId());
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
index 1eabcee8..14517cab 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
@@ -164,4 +164,17 @@ public class OrderDetail extends BaseEntity {
      * 超时扣款次数
      */
     private Integer timeoutFineTimes;
+
+    private String storeName;
+
+    private String storePhone;
+
+    private String workerName;
+
+    private String workerPhone;
+
+    private String keyWords;
+
+    private List<Long> workerIds;
+
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index 5c6e2394..beb7957a 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -129,6 +129,12 @@
             <if test="workerId != null and workerId != 0">
                 AND od.worker_id = #{workerId}
             </if>
+            <if test="workerIds != null and workerIds.size() > 0">
+                AND od.worker_id in
+                <foreach collection="workerIds" item="workerId" open="(" separator="," close=")">
+                    #{workerId}
+                </foreach>
+            </if>
             <if test="goodsCategoryId != null">
                 AND g.dept_goods_category_id = #{goodsCategoryId}
             </if>