From 10a6c5617229aea0785efcf6cac936c443d67b4d Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Wed, 6 Dec 2023 16:43:13 +0800
Subject: [PATCH] fix
---
.../zlpt/equip/api/domain/vo/DevInfoVo.java | 10 ++++++++-
.../main/resources/mapper/DevInfoMapper.xml | 22 +++++++++++++++++--
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
index f296144..ab15b70 100644
--- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
@@ -34,5 +34,13 @@ public class DevInfoVo extends DevInfo {
/** 1上架，2下架*/
private String type;
/**上下架id*/
- private int upId;
+ private int upId;
+ private Integer monthLeasePriceMin;
+ private Integer monthLeasePriceMax;
+ private Integer ageMin;
+ private Integer ageMax;
+ private Integer workingHoursMin;
+ private Integer workingHoursMax;
+ private String monthLeasePriceOrderBy; // ASC or DESC
+ private String updateTimeOrderBy; // ASC or DESC
}
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index 19a7d32..59832b9 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -57,9 +57,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and d.brand = #{brand}
and d.model_name like concat('%', #{modelName}, '%')
and d.production_date = #{productionDate}
- and d.working_hours = #{workingHours}
+
+ and d.working_hours >= #{workingHoursMin} and d.working_hours <= #{workingHoursMax}
+
and d.serial_number = #{serialNumber}
- and d.month_lease_price = #{monthLeasePrice}
+
+ and d.month_lease_price >= #{monthLeasePriceMin} and d.month_lease_price <= #{monthLeasePriceMax}
+
and d.day_lease_price = #{dayLeasePrice}
and d.pic_url = #{picUrl}
and d.js_month_price = #{jsMonthPrice}
@@ -84,6 +88,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
+ order by
+ d.is_active
+
+ ,d.month_lease_price
+
+
+ ,d.month_lease_price DESC
+
+
+ ,d.update_time
+
+
+ ,d.update_time DESC
+