需求

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -332,7 +332,9 @@
             and a.is_exception =1 and a.order_status NOT IN ('YWG','YWGO','YJS')
         </if>
         <if test="ex.orderStatus != null and ex.orderStatus.key =='DYY'.toString()">
-            and a.appointment_time is null and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB','FWQX','FL','YJS','LRCD')
+            and a.appointment_time is null  and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB',
+            'FWQX','FL','YJS','LRCD','DSHPG','CJ','YPD','DXSPD','DZBPG','DWDSPGP','DXSSPGP','DTJXSSPGP','DZBSPGP'
+            )
         </if>
         <if test="ex.partsApplyStatus != null and ex.partsApplyStatus =='PJSQZ'.toString()">
             and a.id in(select order_base_id from websit_parts_apply where `status` = 'ING')

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

@@ -45,7 +45,9 @@
             'DYY' as 'orderStatus',
             '待预约' as 'orderStatusText'
         from pg_order_base a
-        where appointment_time is null and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB','FWQX','FL','YJS','LRCD')
+        where appointment_time is null and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB',
+        'FWQX','FL','YJS','LRCD','DSHPG','CJ','YPD','DXSPD','DZBPG','DWDSPGP','DXSSPGP','DTJXSSPGP','DZBSPGP'
+        )
         <include refid="orderBaseSqlWhere"></include>
         <if test="orderSmallType != null and orderSmallType != ''">
             and a.order_small_type = #{orderSmallType}
@@ -115,7 +117,9 @@
             count(if(order_status in ('DJD'),1,null)) as 'djs',
             count(if(order_status in ('DQD'),1,null)) as 'dqd',
             count(if(order_status in ('FWZ'),1,null)) as 'fwz',
-            count(if(appointment_time is null  and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB','FWQX','FL','YJS','LRCD'),1,null)) as 'dyy',
+            count(if(appointment_time is null  and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB',
+        'FWQX','FL','YJS','LRCD','DSHPG','CJ','YPD','DXSPD','DZBPG','DWDSPGP','DXSSPGP','DTJXSSPGP','DZBSPGP'
+        ),1,null)) as 'dyy',
             count(if(is_exception = 1 and a.order_status not in  ('YWG','YWGO','YJS'),1,null)) as 'ycdcl',
             count(if(appraise_status in ('C'),1,null)) as 'cp'
         from pg_order_base a