no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/workorder/OrderBaseCMapper.java

@@ -15,6 +15,7 @@ public interface OrderBaseCMapper {
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public CountOrderStatusBean countOrderStatus(
             @Param("workerId") String workerId,
+            @Param("workerNumber") String workerNumber,
             @Param("pgIncreOrderId") String pgIncreOrderId,
             @Param("isYb") Boolean isYb,
             @Param("isWb") Boolean isWb,

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

@@ -55,11 +55,11 @@ public class OrderBaseLogic {
      * 工单状态统计
      * @return
      */
-    public CountOrderStatusBean countOrderStatus(String pgIncreOrderId,Boolean isYb,Boolean isWb){
+    public CountOrderStatusBean countOrderStatus(String pgIncreOrderId, Boolean isYb, Boolean isWb) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-        CountOrderStatusBean countOrderStatusBean = orderBaseCMapper.countOrderStatus(currentCompanyWechat.getUserId(),pgIncreOrderId,isYb,isWb,currentCompanyWechat.getCompanyWechatId());
+        CountOrderStatusBean countOrderStatusBean = orderBaseCMapper.countOrderStatus(currentCompanyWechat.getUserId(), currentCompanyWechat.getUser().getWorkerNumber(), pgIncreOrderId, isYb, isWb, currentCompanyWechat.getCompanyWechatId());
         CountOrderStatusBean countOrderStatusBean2 = orderBaseCMapper.countPartsApply(currentCompanyWechat.getUserId());
-        if(countOrderStatusBean2 != null) {
+        if (countOrderStatusBean2 != null) {
             countOrderStatusBean.setPing(countOrderStatusBean2.getPing());
             countOrderStatusBean.setPend(countOrderStatusBean2.getPend());
         }

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

@@ -14,7 +14,7 @@
             COUNT(DISTINCT a.id) AS 'all'
         from pg_order_base a
         left join pg_order_worker b on a.id = b.order_base_id
-    where (b.worker_id=#{workerId} or a.order_status = 'DQD') and a.order_status!='YQX'
+    where (b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status!='YQX'
     <if test="isYb != null and isYb == true">
         and a.pg_incre_order_id != ''
     </if>