From 649b9b4813cba65265919d31c42e231a3d7a6085 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Thu, 18 Jan 2024 10:07:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/yg/df/controller/DfContrastController.java   | 12 ++++++------
 .../kms/yg/sz/controller/SzContrastController.java   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

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<BsSgcDfJbxx> 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<BsSgcDfJbxx> 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<BsSgcDfJbxx> list = bsSgcDfJbxxService.list(query);
@@ -59,15 +59,15 @@ public class DfContrastController {
         //工程管理
         //查询当前版本
         QueryWrapper<BsSgcDfGcgl> 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<BsSgcDfGcgl> 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<BsSgcDfGcgl> 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<BsSgcSzGcda> 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<BsSgcSzGcda> 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<BsSgcSzGcda> list = bsSgcSzGcdaService.list(query);
@@ -57,15 +57,15 @@ public class SzContrastController {
         //工程管理
         //查询当前版本
         QueryWrapper<BsSgcSzGcgl> 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<BsSgcSzGcgl> 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<BsSgcSzGcgl> list1 = bsSgcSzGcglService.list(query1);