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

水质表头加字段、优化查询

master
chenxiwang 2024-07-10 15:55:36 +08:00
parent fd249f2928
commit 074e9d7fa1
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java
View File

@ -86,7 +86,7 @@ public class OsmoticWaterRController {
LambdaQueryWrapper<OsmoticWaterR> wrapper = new QueryWrapper<OsmoticWaterR>().lambda() LambdaQueryWrapper<OsmoticWaterR> wrapper = new QueryWrapper<OsmoticWaterR>().lambda()
.ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), OsmoticWaterR::getTm, osmoticWaterR.getStartTime()) .ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), OsmoticWaterR::getTm, osmoticWaterR.getStartTime())
.le(ObjectUtils.isNotNull(osmoticWaterR.getEndTime()), OsmoticWaterR::getTm, osmoticWaterR.getEndTime()) .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)); return R.ok(service.list(wrapper));
} }
@ -96,7 +96,7 @@ public class OsmoticWaterRController {
QueryWrapper<OsmoticWaterR> qw = new QueryWrapper<>(); QueryWrapper<OsmoticWaterR> qw = new QueryWrapper<>();
qw.ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), "tm", osmoticWaterR.getStartTime()) qw.ge(ObjectUtils.isNotNull(osmoticWaterR.getStartTime()), "tm", osmoticWaterR.getStartTime())
.le(ObjectUtils.isNotNull(osmoticWaterR.getEndTime()), "tm", osmoticWaterR.getEndTime()) .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)); return R.ok(service.page(osmoticWaterR.getPageSo().toPage(), qw));
} }

4
src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java
View File

@ -72,7 +72,7 @@ public class StWaterRController {
.eq(StringUtils.isNotBlank(stWaterR.getStcd()), StWaterR::getStcd, stWaterR.getStcd()) .eq(StringUtils.isNotBlank(stWaterR.getStcd()), StWaterR::getStcd, stWaterR.getStcd())
.ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), StWaterR::getTm, stWaterR.getStartTime()) .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), StWaterR::getTm, stWaterR.getStartTime())
.le(ObjectUtils.isNotNull(stWaterR.getEndTime()), StWaterR::getTm, stWaterR.getEndTime()) .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)); return R.ok(service.list(wrapper));
} }
@ -83,7 +83,7 @@ public class StWaterRController {
qw.eq(StringUtils.isNotBlank(stWaterR.getStcd()), "stcd", stWaterR.getStcd()) qw.eq(StringUtils.isNotBlank(stWaterR.getStcd()), "stcd", stWaterR.getStcd())
.ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime()) .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime())
.le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime()) .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)); return R.ok(service.page(stWaterR.getPageSo().toPage(), qw));
} }

7
src/main/java/com/gunshi/project/xyt/model/AttWaterItem.java
View File

@ -78,4 +78,11 @@ public class AttWaterItem implements Serializable {
@Schema(description="排序") @Schema(description="排序")
private String sort; private String sort;
/**
* 是否比较（0 比较；1 不比较）
*/
@TableField(value="is_compare")
@Schema(description="是否比较（0 比较；1 不比较）")
private String isCompare;
} }