diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java index 6cdf6d56..c719aaee 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java @@ -37,15 +37,15 @@ public class DfContrastController { //基本信息 //查询当前使用的版本 QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.isNull("record_lose_efficacy_time"); + queryWrapper.isNull("EXPR_DATE"); queryWrapper.eq("dike_code", embankmentCode); BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper); //查询之前的10个版本 QueryWrapper query = Wrappers.query(); - query.eq("dike_code", embankmentCode).isNotNull("record_lose_efficacy_time") - .orderByDesc("record_lose_efficacy_time") + query.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") .last("limit 10"); List list = bsSgcDfJbxxService.list(query); @@ -59,15 +59,15 @@ public class DfContrastController { //工程管理 //查询当前版本 QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.isNull("record_lose_efficacy_time"); + wrapper.isNull("EXPR_DATE"); wrapper.eq("dike_code", embankmentCode); BsSgcDfGcgl one1 = bsSgcDfGcglService.getOne(wrapper); //查询之前的10个版本 QueryWrapper query1 = Wrappers.query(); - query1.eq("dike_code", embankmentCode).isNotNull("record_lose_efficacy_time") - .orderByDesc("record_lose_efficacy_time") + query1.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") .last("limit 10"); List list1 = bsSgcDfGcglService.list(query1); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java index 281a75ca..41cac568 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java @@ -35,15 +35,15 @@ public class SzContrastController { //基本信息 //查询当前使用的版本 QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.isNull("record_lose_efficacy_time"); + queryWrapper.isNull("EXPR_DATE"); queryWrapper.eq("waga_code", sluiceCode); BsSgcSzGcda one = bsSgcSzGcdaService.getOne(queryWrapper); //查询之前的10个版本 QueryWrapper query = Wrappers.query(); - query.eq("waga_code", sluiceCode).isNotNull("record_lose_efficacy_time") - .orderByDesc("record_lose_efficacy_time") + query.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") .last("limit 10"); List list = bsSgcSzGcdaService.list(query); @@ -57,15 +57,15 @@ public class SzContrastController { //工程管理 //查询当前版本 QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.isNull("record_lose_efficacy_time"); + wrapper.isNull("EXPR_DATE"); wrapper.eq("waga_code", sluiceCode); BsSgcSzGcgl one1 = bsSgcSzGcglService.getOne(wrapper); //查询之前的10个版本 QueryWrapper query1 = Wrappers.query(); - query1.eq("waga_code", sluiceCode).isNotNull("record_lose_efficacy_time") - .orderByDesc("record_lose_efficacy_time") + query1.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") .last("limit 10"); List list1 = bsSgcSzGcglService.list(query1);