FengChaoYu 7 hónapja
szülő
commit
c15072689d

+ 2 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/workorder/CountOrderStatusBean.java

@@ -28,4 +28,6 @@ public class CountOrderStatusBean {
     private Integer ping = 0;
     @ApiModelProperty("配件已到货")
     private Integer pend = 0;
+    @ApiModelProperty("全部数量")
+    private Integer all = 0;
 }

+ 1 - 2
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/workorder/OrderBaseController.java

@@ -9,7 +9,6 @@ import com.gree.mall.miniapp.helper.ResponseHelper;
 import com.gree.mall.miniapp.logic.workorder.OrderBaseLogic;
 import com.gree.mall.miniapp.logic.workorder.OrderLogLogic;
 import com.gree.mall.miniapp.plus.entity.OrderSmallType;
-import com.gree.mall.miniapp.plus.entity.PgOrderBase;
 import com.gree.mall.miniapp.plus.entity.PgOrderOperatorLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -96,7 +95,7 @@ public class OrderBaseController {
     public ResponseHelper<CountOrderStatusBean> countStatus(
             @ApiParam(value = "延保订单id",required = false) @RequestParam(required = false) String pgIncreOrderId,
             @ApiParam(value = "是否延保单 true=是 false=否",required = false) @RequestParam(required = false) Boolean isYb,
-               @ApiParam(value = "是否维保单 true=是 false=否",required = false) @RequestParam(required = false) Boolean isWb
+            @ApiParam(value = "是否维保单 true=是 false=否",required = false) @RequestParam(required = false) Boolean isWb
     ) throws Exception{
         CountOrderStatusBean countOrderStatusBean = orderBaseLogic.countOrderStatus(pgIncreOrderId,isYb,isWb);
         return ResponseHelper.success(countOrderStatusBean);

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

@@ -10,8 +10,8 @@
             count(DISTINCT if(a.order_status='DQD',a.id,null)) 'dqd',
             count(DISTINCT if(a.order_status in ('YWG','YJS'),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'),a.id,null)) 'jbnwg'
-
+            count(DISTINCT if(a.order_status in ('YWG','YJS'),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
     where (b.worker_id=#{workerId} or a.order_status = 'DQD') and a.order_status!='YQX'