|
|
@ -38,13 +38,13 @@ public class DfContrastController { |
|
|
|
//查询当前使用的版本
|
|
|
|
QueryWrapper<BsSgcDfJbxx> queryWrapper = Wrappers.query(); |
|
|
|
queryWrapper.isNull("record_lose_efficacy_time"); |
|
|
|
queryWrapper.eq("embankment_code", embankmentCode); |
|
|
|
queryWrapper.eq("dike_code", embankmentCode); |
|
|
|
|
|
|
|
BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper); |
|
|
|
|
|
|
|
//查询之前的10个版本
|
|
|
|
QueryWrapper<BsSgcDfJbxx> query = Wrappers.query(); |
|
|
|
query.eq("embankment_code", embankmentCode).isNotNull("record_lose_efficacy_time") |
|
|
|
query.eq("dike_code", embankmentCode).isNotNull("record_lose_efficacy_time") |
|
|
|
.orderByDesc("record_lose_efficacy_time") |
|
|
|
.last("limit 10"); |
|
|
|
|
|
|
@ -60,13 +60,13 @@ public class DfContrastController { |
|
|
|
//查询当前版本
|
|
|
|
QueryWrapper<BsSgcDfGcgl> wrapper = new QueryWrapper<>(); |
|
|
|
wrapper.isNull("record_lose_efficacy_time"); |
|
|
|
wrapper.eq("embankment_code", embankmentCode); |
|
|
|
wrapper.eq("dike_code", embankmentCode); |
|
|
|
|
|
|
|
BsSgcDfGcgl one1 = bsSgcDfGcglService.getOne(wrapper); |
|
|
|
|
|
|
|
//查询之前的10个版本
|
|
|
|
QueryWrapper<BsSgcDfGcgl> query1 = Wrappers.query(); |
|
|
|
query1.eq("embankment_code", embankmentCode).isNotNull("record_lose_efficacy_time") |
|
|
|
query1.eq("dike_code", embankmentCode).isNotNull("record_lose_efficacy_time") |
|
|
|
.orderByDesc("record_lose_efficacy_time") |
|
|
|
.last("limit 10"); |
|
|
|
|
|
|
|