需求

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

@@ -130,10 +130,10 @@
 
     <select id="countOrderBaseIndex" resultType="com.gree.mall.manager.bean.workorder.OrderBaseCountBean">
         select
-            count(if(order_status in ('DSHPG','DWDPG'),1,null)) as 'dpg',
-            count(if(order_status in ('DJD'),1,null)) as 'djs',
+            count(if(order_status in ('DSHPG','DWDPG','DSHPG','CJ','YPD','DXSPD','DZBPG','DWDSPGP','DXSSPGP','DTJXSSPGP','DZBSPGP','DFZXPD','DFZXSPGP'),1,null)) as 'dpg',
+            count(if((a.is_meet =0 or a.order_status  IN ('DJD')) and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB'),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(order_status in ('FWZ','GCSZT','BFWG','DSM','YZP','WDBH','XSBH','TJXSBH','ZBBH','FZXBH'),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','DSHPG','CJ','YPD','DXSPD','DZBPG','DWDSPGP','DXSSPGP','DTJXSSPGP','DZBSPGP'
         ),1,null)) as 'dyy',