From 47f717fcb2d3ab26f49d60c297828a432aa20dba Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 25 Sep 2025 11:38:11 +0800
Subject: [PATCH] no message

---
 .../com/ghy/web/controller/order/OrderMasterController.java | 2 ++
 .../com/ghy/web/controller/worker/WorkerController.java     | 1 +
 .../main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java  | 6 ++++++
 ghy-admin/src/main/resources/templates/worker/worker.html   | 2 +-
 .../src/main/resources/mapper/order/OrderMasterMapper.xml   | 4 ++--
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index a6d99cc6..37de8f48 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -1706,6 +1706,8 @@ public class OrderMasterController extends BaseController {
                 }
 
                 OrderStandardDetail orderStandardDetail = new OrderStandardDetail();
+                orderStandardDetail.setHandoverImages(orderDetail.getHandoverImages());
+                orderStandardDetail.setHandoverRemark(orderDetail.getHandoverRemark());
                 orderStandardDetail.setDeliveryType(orderDetail.getDeliveryType());
                 orderStandardDetail.setDeliveryRemark(orderDetail.getDeliveryRemark());
                 orderStandardDetail.setDeliveryImages(orderDetail.getDeliveryImages());
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
index e69ac7fc..8f3f146c 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
@@ -327,6 +327,7 @@ public class WorkerController extends BaseController {
             startPage();
 //            worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null);
             worker.setName(workerListRequest.getWorkerName());
+            worker.setStatus(0);
             List<Worker> list = workerService.getWorkList(worker);
             list.forEach(w -> {
                 Goods goods = new Goods();
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java
index bbef5e8c..58799ac9 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java
@@ -120,4 +120,10 @@ public class OrderStandardDetail {
      */
     private String trackingNumber;
 
+    
+    
+    private String handoverImages;
+
+    
+    private String handoverRemark;
 }
diff --git a/ghy-admin/src/main/resources/templates/worker/worker.html b/ghy-admin/src/main/resources/templates/worker/worker.html
index 1f4d7bd6..efc8225d 100644
--- a/ghy-admin/src/main/resources/templates/worker/worker.html
+++ b/ghy-admin/src/main/resources/templates/worker/worker.html
@@ -245,7 +245,7 @@
                             var actions = [];
                             actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="areaDetail(\'' + row.workerId + '\')"><i class="fa fa-info"></i>服务区域</a> ');
                             actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="categoryDetail(\'' + row.workerId + '\')"><i class="fa fa-info"></i>服务技能</a> ');
-                            // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.workerId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.workerId + '\')"><i class="fa fa-remove"></i>删除</a> ');
                             return actions.join('');
                         } else {
                             return "";
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index eada7dcf..12b55f5e 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -247,7 +247,7 @@
                 AND ca.country_id = #{district}
             </if>
             <if test="isMonitoredOrder">
-                AND (om.all_self_assigned = 0 or om.all_self_assigned is null) AND om.order_status in (0,1,2,3,4) and om.worker_id is not null
+                AND (om.has_dispatched_all = 0 OR (om.has_dispatched_all = 1 AND om.all_self_assigned = 0)) AND om.order_status in (0,1,2,3,4) and om.worker_id is not null
             </if>
             <if test="allSelfAssigned != null">
                 AND all_self_assigned = #{allSelfAssigned}
@@ -390,7 +390,7 @@
         LEFT JOIN financial_master fm ON om.id = fm.order_master_id
         <where>
             <if test="isMonitoredOrder">
-                AND (om.all_self_assigned = 0 or om.all_self_assigned is null) AND om.order_status in (1,2,3,4)
+                AND (om.has_dispatched_all = 0 OR (om.has_dispatched_all = 1 AND om.all_self_assigned = 0)) AND om.order_status in (1,2,3,4)
             </if>
             <if test="allSelfAssigned != null">
                 AND all_self_assigned = #{allSelfAssigned}