From 70846b437731655baaa9322d00df74a6f471abd4 Mon Sep 17 00:00:00 2001 From: chenxiwang <1520264117@qq.com> Date: Wed, 10 Jul 2024 17:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=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 --- .../controller/OsmoticWaterRController.java | 33 ++++++++++++------- .../xyt/controller/StWaterRController.java | 25 +++++++------- 2 files changed, 35 insertions(+), 23 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 2bd4571..bb98314 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java @@ -1,6 +1,5 @@ package com.gunshi.project.xyt.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -83,27 +82,31 @@ public class OsmoticWaterRController { @Operation(summary = "列表") @PostMapping("/list") public R> list(@RequestBody @Validated OsmoticWaterR osmoticWaterR) { - 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()), ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), OsmoticWaterR::getTm); + QueryWrapper wrapper = new QueryWrapper() + .ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), "tm", osmoticWaterR.getStartTime()) + .le(ObjectUtils.isNotNull(osmoticWaterR.getEndTime()), "tm", osmoticWaterR.getEndTime()); + if(StringUtils.isNotBlank(osmoticWaterR.getSortField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), osmoticWaterR.getSortField()); + } return R.ok(service.list(wrapper)); } @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated OsmoticWaterR osmoticWaterR) { - 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()), ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), "tm"); - return R.ok(service.page(osmoticWaterR.getPageSo().toPage(), qw)); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), "tm", osmoticWaterR.getStartTime()) + .le(ObjectUtils.isNotNull(osmoticWaterR.getEndTime()), "tm", osmoticWaterR.getEndTime()); + if(StringUtils.isNotBlank(osmoticWaterR.getSortField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(osmoticWaterR.getIsAsc()) ? false : osmoticWaterR.getIsAsc(), osmoticWaterR.getSortField()); + } + return R.ok(service.page(osmoticWaterR.getPageSo().toPage(), wrapper)); } /** * 获取导入模板 */ - @Operation(summary = "导入模板") + @Operation(summary = "获取导入模板") @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { ExcelUtil.exportExcel(new ArrayList<>(), "水质整编表", OsmoticWaterRVo.class, response, "水质整编表"); @@ -126,7 +129,13 @@ public class OsmoticWaterRController { @PostMapping("/exportOsmoticWaterRDataExcel") @CrossOrigin public void exportOsmoticWaterRDataExcel(@RequestBody @Validated OsmoticWaterR osmoticWaterR, HttpServletResponse response) { - String filename = "水质整编表" + DateUtil.convertDateToString(osmoticWaterR.getStartTime()) + "_" + DateUtil.convertDateToString(osmoticWaterR.getEndTime()); + String filename = "水质整编表"; + if (ObjectUtils.isNotEmpty(osmoticWaterR.getStartTime())) { + filename.concat("_").concat(DateUtil.convertDateToString(osmoticWaterR.getStartTime())); + } + if (ObjectUtils.isNotEmpty(osmoticWaterR.getStartTime())) { + filename.concat("_").concat(DateUtil.convertDateToString(osmoticWaterR.getEndTime())); + } List vos = ConvertUtil.entityToVoList(this.list(osmoticWaterR).getData(), OsmoticWaterRVo.class); ExcelUtil.exportExcel(vos, filename, OsmoticWaterRVo.class, response, "水质整编表"); } 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 b8493ef..34e85b9 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java @@ -1,6 +1,5 @@ package com.gunshi.project.xyt.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -68,23 +67,27 @@ public class StWaterRController { @Operation(summary = "列表") @PostMapping("/list") public R> list(@RequestBody @Validated StWaterR stWaterR) { - LambdaQueryWrapper wrapper = new QueryWrapper().lambda() - .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()), ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), StWaterR::getTm); + QueryWrapper wrapper = new QueryWrapper() + .eq(StringUtils.isNotBlank(stWaterR.getStcd()), "stcd", stWaterR.getStcd()) + .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime()) + .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime()); + if(StringUtils.isNotBlank(stWaterR.getSortField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField()); + } return R.ok(service.list(wrapper)); } @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated StWaterR stWaterR) { - QueryWrapper qw = new QueryWrapper<>(); - qw.eq(StringUtils.isNotBlank(stWaterR.getStcd()), "stcd", stWaterR.getStcd()) + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.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()), ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), "tm"); - return R.ok(service.page(stWaterR.getPageSo().toPage(), qw)); + .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime()); + if(StringUtils.isNotBlank(stWaterR.getSortField())){ + wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField()); + } + return R.ok(service.page(stWaterR.getPageSo().toPage(), wrapper)); } @Operation(summary = "导出")