From 074e9d7fa1d3dbc6b7232a1dbbc638887b53b4b7 Mon Sep 17 00:00:00 2001 From: chenxiwang <1520264117@qq.com> Date: Wed, 10 Jul 2024 15:55:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E8=B4=A8=E8=A1=A8=E5=A4=B4=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=81=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/xyt/controller/OsmoticWaterRController.java | 4 ++-- .../gunshi/project/xyt/controller/StWaterRController.java | 4 ++-- .../java/com/gunshi/project/xyt/model/AttWaterItem.java | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java index 86b3d29..2bd4571 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java @@ -86,7 +86,7 @@ public class OsmoticWaterRController { LambdaQueryWrapper wrapper = new QueryWrapper().lambda() .ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), OsmoticWaterR::getTm, osmoticWaterR.getStartTime()) .le(ObjectUtils.isNotNull(osmoticWaterR.getEndTime()), OsmoticWaterR::getTm, osmoticWaterR.getEndTime()) - .orderBy(StringUtils.isNotBlank(osmoticWaterR.getSortField()), osmoticWaterR.getIsAsc(), OsmoticWaterR::getTm); + .orderBy(StringUtils.isNotBlank(osmoticWaterR.getSortField()), ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), OsmoticWaterR::getTm); return R.ok(service.list(wrapper)); } @@ -96,7 +96,7 @@ public class OsmoticWaterRController { QueryWrapper qw = new QueryWrapper<>(); qw.ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), "tm", osmoticWaterR.getStartTime()) .le(ObjectUtils.isNotNull(osmoticWaterR.getEndTime()), "tm", osmoticWaterR.getEndTime()) - .orderBy(StringUtils.isNotBlank(osmoticWaterR.getSortField()), osmoticWaterR.getIsAsc(), "tm"); + .orderBy(StringUtils.isNotBlank(osmoticWaterR.getSortField()), ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), "tm"); return R.ok(service.page(osmoticWaterR.getPageSo().toPage(), qw)); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java index 3568ba5..b8493ef 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java @@ -72,7 +72,7 @@ public class StWaterRController { .eq(StringUtils.isNotBlank(stWaterR.getStcd()), StWaterR::getStcd, stWaterR.getStcd()) .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), StWaterR::getTm, stWaterR.getStartTime()) .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), StWaterR::getTm, stWaterR.getEndTime()) - .orderBy(StringUtils.isNotBlank(stWaterR.getSortField()), stWaterR.getIsAsc(), StWaterR::getTm); + .orderBy(StringUtils.isNotBlank(stWaterR.getSortField()), ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), StWaterR::getTm); return R.ok(service.list(wrapper)); } @@ -83,7 +83,7 @@ public class StWaterRController { qw.eq(StringUtils.isNotBlank(stWaterR.getStcd()), "stcd", stWaterR.getStcd()) .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime()) .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime()) - .orderBy(StringUtils.isNotBlank(stWaterR.getSortField()), stWaterR.getIsAsc(), "tm"); + .orderBy(StringUtils.isNotBlank(stWaterR.getSortField()), ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), "tm"); return R.ok(service.page(stWaterR.getPageSo().toPage(), qw)); } diff --git a/src/main/java/com/gunshi/project/xyt/model/AttWaterItem.java b/src/main/java/com/gunshi/project/xyt/model/AttWaterItem.java index db813f0..bfbc178 100644 --- a/src/main/java/com/gunshi/project/xyt/model/AttWaterItem.java +++ b/src/main/java/com/gunshi/project/xyt/model/AttWaterItem.java @@ -78,4 +78,11 @@ public class AttWaterItem implements Serializable { @Schema(description="排序") private String sort; + /** + * 是否比较（0 比较；1 不比较） + */ + @TableField(value="is_compare") + @Schema(description="是否比较（0 比较；1 不比较）") + private String isCompare; + }