需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -228,6 +228,8 @@ public class OrderBaseLogic {
             orderStatusList.add(OrderBaseStatusEnum.FWZ.getKey());
             orderStatusList.add(OrderBaseStatusEnum.GCSZT.getKey());
             orderStatusList.add(OrderBaseStatusEnum.BFWG.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.YZP.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.DSM.getKey());
         }
 
         Page page = pgOrderBaseService.lambdaQuery()

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -4,13 +4,13 @@
 
     <select id="countOrderStatus" resultType="com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean">
          select
-            count(DISTINCT if(a.order_status='DJD' or a.is_meet = false ,a.id,null)) 'djd',
-            count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG'),a.id,null)) 'fwz',
+            count(DISTINCT if((is_import_excel = false and a.order_status='DJD') or (is_import_excel = false and a.is_meet = false) ,a.id,null)) 'djd',
+            count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG','DSM','YZP'),a.id,null)) 'fwz',
             count(DISTINCT if(a.is_exception=1,a.id,null)) 'ycd',
             count(DISTINCT if(a.order_status='DQD',a.id,null)) 'dqd',
             count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX','YWGO','WDWG'),a.id,null)) 'ywg',
             count(DISTINCT if(a.over_time between date(now()) and now(),a.id,null)) 'jrwg',
-            count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX'),a.id,null)) 'jbnwg',
+            count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX','YWGO','WDWG'),a.id,null)) 'jbnwg',
             COUNT(DISTINCT a.id) AS 'all'
         from pg_order_base a
         left join pg_order_worker b on a.id = b.order_base_id