急报/超时/售后三个状态不出现全部自己承接的监控单

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java

@@ -485,13 +485,19 @@ public class OrderController extends BaseController {
             response.setMonitoredOrderNum(orderMasterService.countOrderMasterList(orderMaster));
             orderMaster.setIsMonitoredOrder(false);
             // 统计搁置单量
-            orderDetail.setShelveStatus(1);
-            response.setShelvedOrderNum(orderDetailService.countOrderDetailList(orderDetail));
-            orderDetail.setShelveStatus(0);
-            // 统计售后中单量
             OrderListRequest orderListRequest = new OrderListRequest();
             orderListRequest.setWorkerId(request.getWorkerId());
             orderListRequest.setIsMonitoredOrder(true);
+            orderListRequest.setAllSelfAssigned(0);
+            orderListRequest.setShelveStatus(1);
+            AjaxResult shelveRes = this.appMixOrderList(orderListRequest);
+            List<OrderListResponse> shelveList = (List)shelveRes.get("data");
+            response.setShelvedOrderNum(shelveList.size());
+            // 统计售后中单量
+            orderListRequest = new OrderListRequest();
+            orderListRequest.setWorkerId(request.getWorkerId());
+            orderListRequest.setIsMonitoredOrder(true);
+            orderListRequest.setAllSelfAssigned(0);
             AjaxResult afterListRes = this.appMixAfterList(orderListRequest);
             List<AfterServiceRecord> afterList = (List<AfterServiceRecord>)afterListRes.get("data");
             response.setAfterListNum(afterList.size());
@@ -500,6 +506,7 @@ public class OrderController extends BaseController {
             orderListRequest.setIsOverTime(true);
             orderListRequest.setWorkerId(request.getWorkerId());
             orderListRequest.setIsMonitoredOrder(true);
+            orderListRequest.setAllSelfAssigned(0);
             AjaxResult overTimeRes = this.appMixOrderList(orderListRequest);
             List<OrderListResponse> overTimeList = (List)overTimeRes.get("data");
             response.setOverTimeOrderNum(overTimeList.size());

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java

@@ -378,6 +378,7 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setIsOverTime(isOverTime);
             orderListResponse.setChangeMoney(changeMoney);
 //            orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
+            orderListResponse.setUpdateTime(detail.getUpdateTime());
             orderListResponses.add(orderListResponse);
         });
         return voDataTable(orderListResponses, list);

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListRequest.java

@@ -25,4 +25,8 @@ public class OrderListRequest {
     private Boolean isOverTime;
 
     private Boolean isMonitoredOrder;
+
+    private Integer shelveStatus;
+
+    private Integer allSelfAssigned;
 }

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java

@@ -100,4 +100,6 @@ public class OrderListResponse {
     private List<AfterServiceRecord> afterServiceRecordList;
 
     private Boolean isOnlyServ;
+
+    private Date updateTime;
 }

ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -44,6 +44,9 @@
             <if test="customerPlace != null and customerPlace != ''">
                 AND customer_place = #{customerPlace}
             </if>
+            <if test="placeStatus != null">
+                AND place_status = #{placeStatus}
+            </if>
         </where>
     </select>
 

ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java

@@ -95,4 +95,6 @@ public class OrderMaster extends BaseEntity {
     private Integer hasDispatchedAll;
 
     private List<Long> customerIds;
+
+    private Boolean shelveStatus;
 }

ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml

@@ -65,6 +65,7 @@
                od.clock_in_location,
                od.create_by,
                od.create_time,
+               od.update_time,
                od.remark
         FROM order_detail od
         LEFT JOIN order_master om ON om.id = od.order_master_id
@@ -114,6 +115,9 @@
             <if test="shelveStatus != null">
                 AND od.shelve_status = ${shelveStatus}
             </if>
+            <if test="shelveStatus == null">
+                AND od.shelve_status = 0
+            </if>
         </where>
         order by od.create_time
         <trim suffixOverrides=",">

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -80,6 +80,9 @@
             <if test="isMonitoredOrder">
                 AND all_self_assigned = 0 AND om.order_status in (1,2,3,4,5)
             </if>
+            <if test="allSelfAssigned != null">
+                AND all_self_assigned = #{allSelfAssigned}
+            </if>
             <if test="deptId != null and deptId != 0">
                 AND om.dept_id = #{deptId}
             </if>