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 = "供水水方数据导出")