From a49a6a80a76b2642232b887dd646a255cf5eaa4e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 18:16:01 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index e9548ed..6a56493 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -28,6 +28,7 @@
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.C3ChargingBo;
import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
@@ -172,7 +173,7 @@
*
* @return
*/
- public Map getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam) {
+ public Map getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam, Integer order, Integer seq) {
if (c3ChargingParam == null) {
c3ChargingParam = new C3ChargingParam();
}
@@ -181,12 +182,38 @@
if (c3ChargingParam.getKeyword() != null) {
c3ChargingParam.setKeyword(c3ChargingParam.getKeyword().trim());
}
+ //鎺掑簭瀛楁
+ String orderByResult = "t1.c3_id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.CHARGE_POLE_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
List<C3ChargingBo> c3ChargingBoList;
if (SecurityUtils.getClientId() == null) {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null);
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null, orderBy);
} else {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId());
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId(), orderBy);
}
//鍦ㄧ嚎鏁伴噺
int onlineNumber = 0;
@@ -264,9 +291,9 @@
List<C3ChargingBo> c3ChargingBoList;
if (SecurityUtils.getClientId() == null) {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, null);
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, null, "c3_id ASC");
} else {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, SecurityUtils.getUserId());
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, SecurityUtils.getUserId(), "c3_id ASC");
}
return c3ChargingBoList;
}
--
Gitblit v1.9.3