From cc61368bd108f36e73dad01e966005147525f5e6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 16:23:10 +0800
Subject: [PATCH] update
---
jh-framework/jh-spring-boot-starter-mybatis/src/main/java/cn/lihu/jh/framework/mybatis/core/query/LambdaQueryWrapperX.java | 6 ++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/jh-framework/jh-spring-boot-starter-mybatis/src/main/java/cn/lihu/jh/framework/mybatis/core/query/LambdaQueryWrapperX.java b/jh-framework/jh-spring-boot-starter-mybatis/src/main/java/cn/lihu/jh/framework/mybatis/core/query/LambdaQueryWrapperX.java
index f775cf8..6793ac1 100644
--- a/jh-framework/jh-spring-boot-starter-mybatis/src/main/java/cn/lihu/jh/framework/mybatis/core/query/LambdaQueryWrapperX.java
+++ b/jh-framework/jh-spring-boot-starter-mybatis/src/main/java/cn/lihu/jh/framework/mybatis/core/query/LambdaQueryWrapperX.java
@@ -115,6 +115,12 @@
}
@Override
+ public LambdaQueryWrapperX<T> orderByAsc(SFunction<T, ?> column) {
+ super.orderByAsc(true, column);
+ return this;
+ }
+
+ @Override
public LambdaQueryWrapperX<T> orderByDesc(SFunction<T, ?> column) {
super.orderByDesc(true, column);
return this;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
index fa9ddd3..4bd0235 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
@@ -27,13 +27,13 @@
default PageResult<DeviceDO> selectPage(DevicePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<DeviceDO>()
.eqIfPresent(DeviceDO::getDevId, reqVO.getDevId())
- .eqIfPresent(DeviceDO::getState, reqVO.getState())
+ .inIfPresent(DeviceDO::getState, reqVO.getState())
.eqIfPresent(DeviceDO::getCategory, reqVO.getCategory())
.eqIfPresent(DeviceDO::getBrand, reqVO.getBrand())
.eqIfPresent(DeviceDO::getModel, reqVO.getModel())
.betweenIfPresent(DeviceDO::getPurchaseDate, reqVO.getPurchaseDate())
.betweenIfPresent(DeviceDO::getCreateTime, reqVO.getCreateTime())
- .orderByDesc(DeviceDO::getId));
+ .orderByAsc(DeviceDO::getStateDate));
}
@Select("select * from lihu.device where dev_id=#{devId}")
--
Gitblit v1.9.3