需求

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

@@ -222,7 +222,9 @@ public class OrderBaseLogic {
                                 .like(PgOrderBase::getOrderSmallTypeText,keyword).or()
                                 .like(PgOrderBase::getUserMobile,keyword).or()
                                 .like(PgOrderBase::getAddress,keyword))
-                .in(CollectionUtils.isNotEmpty(orderStatusList), PgOrderBase::getOrderStatus, orderStatusList)
+                .and(item -> item.in(CollectionUtils.isNotEmpty(orderStatusList), PgOrderBase::getOrderStatus, orderStatusList)
+                .or(orderStatusList.contains("DJD")).or().eq(PgOrderBase::getIsMeet,false)
+                )
                 .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

@@ -4,7 +4,7 @@
 
     <select id="countOrderStatus" resultType="com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean">
          select
-            count(DISTINCT if(a.order_status='DJD',a.id,null)) 'djd',
+            count(DISTINCT if(a.order_status='DJD' or a.is_mett = false ,a.id,null)) 'djd',
             count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG'),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',