师傅姓名/电话

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());

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;
+
 }

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>