From 7617d46abee2950b7336e3379f8c7a564939cb54 Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期六, 10 十月 2026 17:54:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 0ec1b7d..40ef089 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -2432,10 +2432,38 @@
}
return R.ok(result);
}
-
-
-
-
+
+ /**
+ * 内部接口：统计公司名下进行中充电订单数（三表合计，状态 2=启动中/3=充电中/4=停止中，
+ * 账户模式切换：分配→共享 前校验使用）
+ */
+ @PostMapping("/inner/count-active-by-company")
+ public R<Integer> countActiveByCompany(@RequestParam("companyId") Integer companyId) {
+ if (companyId == null) {
+ return R.ok(0);
+ }
+ try {
+ List<Integer> activeStatuses = Arrays.asList(2, 3, 4);
+ long count = 0L;
+ count += chargingOrderService.lambdaQuery()
+ .eq(TChargingOrder::getCompanyId, companyId)
+ .in(TChargingOrder::getStatus, activeStatuses)
+ .count();
+ count += cardChargingOrderService.lambdaQuery()
+ .eq(TCardChargingOrder::getCompanyId, companyId)
+ .in(TCardChargingOrder::getStatus, activeStatuses)
+ .count();
+ count += vinChargingOrderService.lambdaQuery()
+ .eq(TVinChargingOrder::getCompanyId, companyId)
+ .in(TVinChargingOrder::getStatus, activeStatuses)
+ .count();
+ return R.ok((int) count);
+ } catch (RuntimeException ex) {
+ log.error("统计公司进行中充电订单失败：companyId={}", companyId, ex);
+ return R.fail("统计公司进行中充电订单失败:" + ex.getMessage());
+ }
+ }
+
@RequiresPermissions(value = {"/chargingOperationAnalysis"}, logical = Logical.OR)
@ResponseBody
@PostMapping(value = "/charging/statistics")
--
Gitblit v1.7.1