From bb5f136025cb940d1a28691b4c47d51e99d9fd34 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 26 Jun 2023 00:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/order/orderManager.html         | 34 +++++++++++--------
 .../ghy/order/domain/OrderMasterCount.java    |  3 ++
 .../mapper/order/OrderMasterMapper.xml        |  5 +++
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html
index 5376da84..e46accc5 100644
--- a/ghy-admin/src/main/resources/templates/order/orderManager.html
+++ b/ghy-admin/src/main/resources/templates/order/orderManager.html
@@ -80,16 +80,18 @@
                             已发布
                             (<span id="publishedOrderNum">0</span>)
                         </a>
-                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1})">
-                            已接单
-                            (<span id="acceptedOrderNum">0</span>)
+<!--                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1})">-->
+<!--                            已接单-->
+<!--                            (<span id="acceptedOrderNum">0</span>)-->
+<!--                        </a>-->
+                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '01'})">
+                            未约时
+                            (<span id="notAppointedOrderNum">0</span>)
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})">
+                            未排班
+                            (<span id="notArrangedOrderNum">0</span>)
                         </a>
-<!--                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '01'})">-->
-<!--                            未约时-->
-<!--                        </a>-->
-<!--                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})">-->
-<!--                            未排班-->
-<!--                        </a>-->
                         <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})">
                             待上门
                             (<span id="waitForDoorOrderNum">0</span>)
@@ -265,13 +267,13 @@
                             接单超时
                             (<span id="newTimeoutOrderNum">0</span>)
                         </a>
-                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1})">
+                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1, isCall: '01'})">
                             约单超时
-                            (<span class="acceptedTimeoutOrderNum">0</span>)
+                            (<span id="notAppointedTimeoutOrderNum">0</span>)
                         </a>
-                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1})">
+                        <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1, isCall: '02'})">
                             排单超时
-                            (<span class="acceptedTimeoutOrderNum">0</span>)
+                            (<span id="notArrangedTimeoutOrderNum">0</span>)
                         </a>
                         <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
                             无法排单
@@ -411,7 +413,8 @@
             success: function (result) {
                 if (result.code == web_status.SUCCESS) {
                     $('#newOrderNum').text(result.data.newOrderNum);
-                    $('#acceptedOrderNum').text(result.data.acceptedOrderNum);
+                    $('#notAppointedOrderNum').text(result.data.notAppointedOrderNum);
+                    $('#notArrangedOrderNum').text(result.data.notArrangedOrderNum);
                     $('#canceledOrderNum').text(result.data.canceledOrderNum);
                     $('.confirmingOrderNum').text(result.data.confirmingOrderNum);
                     $('#finishedOrderNum').text(result.data.finishedOrderNum);
@@ -432,7 +435,8 @@
             success: function (result) {
                 if (result.code == web_status.SUCCESS) {
                     $('#newTimeoutOrderNum').text(result.data.newOrderNum);
-                    $('.acceptedTimeoutOrderNum').text(result.data.acceptedOrderNum);
+                    $('#notAppointedTimeoutOrderNum').text(result.data.notAppointedOrderNum);
+                    $('#notArrangedTimeoutOrderNum').text(result.data.notArrangedOrderNum);
                     $('#servingTimeoutOrderNum').text(result.data.servingOrderNum);
                     $('#waitForDoorTimeoutOrderNum').text(result.data.waitForDoorOrderNum);
                 } else {
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java
index 812295cf..8a7ee044 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java
@@ -9,4 +9,7 @@ import lombok.Data;
  */
 @Data
 public class OrderMasterCount extends OrderCount {
+    private Integer notAppointedOrderNum;
+
+    private Integer notArrangedOrderNum;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index bc3c02a9..988c1d54 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -427,6 +427,8 @@
         select
             count(case when om.order_status = 0 then 1 else null end) as newOrderNum,
             count(case when om.order_status = 1 then 1 else null end) as acceptedOrderNum,
+            count(case when om.order_status = 1 and om.is_call = '01' then 1 else null end) as notAppointedOrderNum,
+            count(case when om.order_status = 1 and om.is_call = '02' then 1 else null end) as notArrangedOrderNum,
             count(case when om.order_status = 2 then 1 else null end) as waitForDoorOrderNum,
             count(case when om.order_status = 3 then 1 else null end) as servingOrderNum,
             count(case when om.order_status = 4 then 1 else null end) as confirmingOrderNum,
@@ -437,6 +439,9 @@
         <if test="timeout != null">
             AND om.timeout_ = #{timeout}
         </if>
+        <if test="isCall != null">
+            AND om.is_call = #{isCall}
+        </if>
     </select>
 
 </mapper>