From 39f598d59b17076a6fcf018711f4fb856726a335 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Thu, 29 Feb 2024 16:46:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B0=B4=E9=9B=A8=E6=83=85mapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kms/yxgh/df/domain/DfWaterRegime.java | 51 +++++++++++++++++++
 .../kms/yxgh/df/mapper/DfYhRecordMapper.java  |  8 +--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfWaterRegime.java

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfWaterRegime.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfWaterRegime.java
new file mode 100644
index 00000000..cf008f2e
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfWaterRegime.java
@@ -0,0 +1,51 @@
+package com.kms.yxgh.df.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.kms.yxgh.base.SyBaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: DfWaterRegime
+ * @Description: TODO
+ * @Date: 2024/1/31 下午2:27
+ * *
+ * @author: hxh
+ * @version: 1.0
+ */
+
+@Data
+@TableName("bs_sgc_df_syq")
+public class DfWaterRegime extends SyBaseEntity {
+
+    @ApiModelProperty("堤防名称")
+    private String dikeName;
+
+    @ApiModelProperty("起点行政区划")
+    private String adcdStart;
+
+    @ApiModelProperty("堤防编码")
+    private String dikeCode;
+
+    @ApiModelProperty("终点行政区划")
+    private String adcdEnd;
+
+    @ApiModelProperty("堤防类型")
+    private String dikeType;
+
+    @ApiModelProperty("堤防型式")
+    private String dikePatt;
+
+    @ApiModelProperty("工程任务")
+    private String engTask;
+
+    @ApiModelProperty("天气情况")
+    private String weatherCondition;
+
+    @ApiModelProperty("水位高度")
+    private Float waterLevel;
+
+    @ApiModelProperty("雨量监测")
+    private Float rainFall;
+
+}
\ No newline at end of file
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
index 3beb51e0..2a32a310 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
@@ -22,10 +22,10 @@ public interface DfYhRecordMapper extends BaseMapper<DfYhRecord> {
 
     @Select("<script>" +
             "SELECT yhjl.id, yhjl.plan_id, yhjl.name, yhjl.before, yhjl.middle, yhjl.after, " +
-            "yhjl.maintenanceFunds, yhjl.implement, yhjl.status, df.dike_code, df.dike_name, " +
+            "yhjl.maintenance_funds, yhjl.implement, yhjl.status, df.dike_code, df.dike_name, " +
             "yhjl.create_time, yhjl.update_time " +
             "FROM bs_sgc_df_yhjl yhjl " +
-            "LEFT JOIN bs_sgc_df_info df ON yhjl.dike_code = df.dike_code " +
+            "LEFT JOIN bs_sgc_df_gcda df ON yhjl.dike_code = df.dike_code " +
             "WHERE 1=1 " +
             "<if test='searchDto.startCreatedTime != null'>" +
             "AND yhjl.create_time &gt;= #{searchDto.startCreatedTime} " +
@@ -43,10 +43,10 @@ public interface DfYhRecordMapper extends BaseMapper<DfYhRecord> {
             "AND yhjl.status = #{searchDto.status} " +
             "</if>" +
             "<if test='searchDto.minRepairCost != null'>" +
-            "AND yhjl.maintenanceFunds &gt;= #{searchDto.minRepairCost} " +
+            "AND yhjl.maintenance_funds &gt;= #{searchDto.minRepairCost} " +
             "</if>" +
             "<if test='searchDto.maxRepairCost != null'>" +
-            "AND yhjl.maintenanceFunds &lt;= #{searchDto.maxRepairCost} " +
+            "AND yhjl.maintenance_funds &lt;= #{searchDto.maxRepairCost} " +
             "</if>" +
             "ORDER BY yhjl.create_time DESC" +
             "</script>")