From dd8d82f3a54942bb3b15cbe10d1058f032f87ec0 Mon Sep 17 00:00:00 2001 From: cxw <1520264117@qq.com> Date: Thu, 9 Jan 2025 17:15:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E6=B0=B4=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=B0=B4=E9=87=8F=E6=80=BB=E9=87=8F=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f5c8e98221046d1545ee85d297fb30493203cb23) --- .../StWaterRReorganizeController.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java index 41e9858..794904a 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -88,7 +89,13 @@ public class StWaterRReorganizeController { if(StringUtils.isNotBlank(stWaterRReorganize.getOrderField())){ wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterRReorganize.getIsAsc()) ? false : stWaterRReorganize.getIsAsc(), stWaterRReorganize.getOrderField()); } - return R.ok(service.list(wrapper)); + List list = service.list(wrapper); + if(CollectionUtils.isNotEmpty(list)){ + for(StWaterRReorganize dto : list){ + dto.setSumV(dto.getEcologyV().add(dto.getLifeV())); + } + } + return R.ok(list); } @Operation(summary = "分页") @@ -113,7 +120,13 @@ public class StWaterRReorganizeController { if(StringUtils.isNotBlank(stWaterRReorganize.getOrderField())){ wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterRReorganize.getIsAsc()) ? false : stWaterRReorganize.getIsAsc(), stWaterRReorganize.getOrderField()); } - return R.ok(service.page(stWaterRReorganize.getPageSo().toPage(), wrapper)); + Page page = service.page(stWaterRReorganize.getPageSo().toPage(), wrapper); + if(CollectionUtils.isNotEmpty(page.getRecords())){ + for(StWaterRReorganize dto : page.getRecords()){ + dto.setSumV(dto.getEcologyV().add(dto.getLifeV())); + } + } + return R.ok(page); } @Operation(summary = "供水水方数据导出")