需求

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

@@ -270,7 +270,7 @@ public class OrderBaseLogic {
                         item.in(PgOrderBase::getOrderStatus,orderStatusList).eq(PgOrderBase::getIsMeet, finalIsMeet))
 
                 .and(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DCL"),item ->
-                        item.notIn(PgOrderBase::getOrderStatus,orderStatusList))
+                        item.notIn(PgOrderBase::getOrderStatus,orderStatusList)).or().eq(PgOrderBase::getIsMeet,finalIsMeet)
 
                 .and(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),item ->
                         item.in(PgOrderBase::getOrderStatus,orderStatusList)

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

@@ -11,7 +11,7 @@
             count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX','YWGO','WDWG') and a.is_meet = true,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','DQD'),a.id,null)) 'WWG',
+            count(DISTINCT if(a.order_status not in ('YWG','YJS','GCSZX','YWGO','WDWG','DQD') or a.is_meet = false ,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