Merge remote-tracking branch 'origin/develop' into develop

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

@@ -256,6 +256,7 @@ public class OrderBaseLogic {
                 )
 
                 )
+                .eq(CollectionUtils.isNotEmpty(orderStatusList) && !orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,true)
                 .eq(StringUtils.equals(orderStatus, OrderBaseStatusEnum.YCD.getKey()),PgOrderBase::getIsException,true)
                 .between(!StringUtils.equals(orderStatus, OrderBaseStatusEnum.YWG.getKey())
                         && StringUtils.isNoneBlank(startTime, endTime) && (byDay == null || byDay != 3), PgOrderBase::getDispatchTime, startTime, endTime)

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

@@ -5,13 +5,13 @@
     <select id="countOrderStatus" resultType="com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean">
          select
             count(DISTINCT if((is_import_excel = false and a.order_status='DJD') or (is_import_excel = true 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.order_status in ('FWZ','GCSZT','BFWG','DSM','YZP')  and a.is_meet = true,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','YWGO','WDWG'),a.id,null)) 'jbnwg',
-            count(DISTINCT if(a.order_status not in ('YWG','YJS','GCSZX','YWGO','WDWG'),a.id,null)) 'WWG',
+            count(DISTINCT if(a.order_status not in ('YWG','YJS','GCSZX','YWGO','WDWG','DQD'),a.id,null)) 'WWG',
             COUNT(DISTINCT a.id) AS 'all'
         from pg_order_base a
         left join pg_order_worker b on a.id = b.order_base_id