需求

mall-server-api/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -20,7 +20,7 @@
         <if test="startTime != null and startTime != ''">
             and a.create_time between #{startTime} and #{endTime}
         </if>
-        and a.order_status != 'DYY'
+        and a.order_status not in ('DYY','DJD')
         group by order_status_text
     union
         select
@@ -39,6 +39,23 @@
         <if test="startTime != null and startTime != ''">
             and a.create_time between #{startTime} and #{endTime}
         </if>
+        union
+        select
+        count(distinct a.id)  'total',
+        'DJD' as 'orderStatus',
+        '待接单' as 'orderStatusText'
+        from pg_order_base a
+        where is_meet=0 or a.order_status  IN ('DJD')
+        <include refid="orderBaseSqlWhere"></include>
+        <if test="orderSmallType != null and orderSmallType != ''">
+            and a.order_small_type = #{orderSmallType}
+        </if>
+        <if test="orderSmallTypeText != null and orderSmallTypeText != ''">
+            and a.order_small_type_text = #{orderSmallTypeText}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and a.create_time between #{startTime} and #{endTime}
+        </if>
     union
         select
             count(distinct a.id)  'total',