From 24d12bfdac4a3925eb05655ecfc03c9e9c1383a4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 31 Jan 2024 17:39:58 +0800
Subject: [PATCH] 增加自定义排序
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
index 33dfe87..b516cdd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
@@ -14,6 +14,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -147,7 +148,9 @@
@ApiOperation(value = "大坝安全统计-大坝安全监测预警详情", notes = "大坝安全统计-大坝安全监测预警详情")
@GetMapping(value = "/alarmDetailPage")
public R alarmDetail(AlarmGetVO alarmGet,Query query){
- PageVO<AlarmGetVO> page = nkyClient.getAlarmDetailPage(query.getCurrent(), query.getSize(), alarmGet);
+ String ascs = StringUtil.isBlank(query.getAscs())?"":query.getAscs();
+ String descs = StringUtil.isBlank(query.getDescs())?"":query.getDescs();
+ PageVO<AlarmGetVO> page = nkyClient.getAlarmDetailPage(query.getCurrent(), query.getSize(), alarmGet,ascs,descs);
return R.data(page);
}
--
Gitblit v1.9.3