From a071c70355a0ac580ff124e6fbc4bf4c07d9efb0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 06 八月 2025 12:30:27 +0800
Subject: [PATCH] 所有代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
index 418894b..99b3d35 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.ChargingOrderGroup;
+import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.dto.GetImportOrderDTO;
import com.ruoyi.order.model.ChargeOrder;
@@ -12,6 +14,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.List;
@Api(tags = "充电订单")
@RestController
@@ -19,7 +22,12 @@
public class ChargeOrderController {
@Resource
private ChargeOrderService chargeOrderService;
+ @PostMapping(value = "/getBySiteIdAndTime")
+ public R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto) {
+ List<ChargingOrderGroup> groups = chargeOrderService.chargingOrderGroup(chargingPercentProvinceDto);
+ return R.ok(groups);
+ }
/**
* 导入充电信息
*/
@@ -30,8 +38,8 @@
if (file.isEmpty()) {
return R.fail("请选择要上传的文件");
}
- chargeOrderService.importExpress(file);
- return R.ok();
+
+ return chargeOrderService.importExpress(file);
}
/**
--
Gitblit v1.7.1