yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化供水分析水量总量计算方式 

(cherry picked from commit f5c8e98221046d1545ee85d297fb30493203cb23)
master
cxw 2025-01-09 17:15:14 +08:00
parent c3d96423cc
commit dd8d82f3a5
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/gunshi/project/xyt/controller/StWaterRReorganizeController.java
View File

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