From faf19bb9aeb4a66125be78873e3c4cbea2ef077e Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 26 四月 2024 14:32:24 +0800
Subject: [PATCH] 修改 取水口查询接口 增加修改查询的数据内容
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java | 36 ++++++++++++++++-
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java | 4 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 25 ++++++++----
3 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
index f9a4449..d6d1963 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
@@ -23,20 +23,30 @@
public class VoIntake implements BaseEntity {
private static final long serialVersionUID = 202312261049001L;
- @Schema(title = "ID")
- @ExcelProperty("ID")
+ @Schema(title = "鍙栨按鍙D")
+ @ExcelProperty("鍙栨按鍙D")
@ColumnWidth(10)
- private String id;
+ private String intakeId;
@Schema(title = "鍙栨按鍙ｅ悕绉�")
@ExcelProperty("鍙栨按鍙ｅ悕绉�")
@ColumnWidth(15)
private String intakeName;
+ @Schema(title = "鍒嗘按鎴縄D")
+ @ExcelProperty("鍒嗘按鎴縄D")
+ @ColumnWidth(10)
+ private String divideId;
+
@Schema(title = "鎵�灞炲垎姘存埧")
@ExcelProperty("鎵�灞炲垎姘存埧")
@ColumnWidth(15)
private String divideName;
+
+ @Schema(title = "鐗囧尯ID")
+ @ExcelProperty("鐗囧尯ID")
+ @ColumnWidth(15)
+ private String blockId;
@Schema(title = "鎵�灞炵墖鍖�")
@ExcelProperty("鎵�灞炵墖鍖�")
@@ -53,9 +63,29 @@
@ColumnWidth(25)
private String address;
+ @Schema(title = "缁忓害")
+ @ExcelProperty("缁忓害")
+ @ColumnWidth(25)
+ private String lng;
+
+ @Schema(title = "绾害")
+ @ExcelProperty("绾害")
+ @ColumnWidth(25)
+ private String lat;
+
+ @Schema(title = "鎿嶄綔浜�")
+ @ExcelProperty("鎿嶄綔浜�")
+ @ColumnWidth(25)
+ private String operator;
+
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "鎿嶄綔鏃堕棿")
@ExcelIgnore
private Date operateDt;
+
+ @Schema(title = "澶囨敞")
+ @ExcelProperty("澶囨敞")
+ @ColumnWidth(250)
+ private String remarks;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 8470ae2..c99a293 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -227,12 +227,12 @@
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
- <if test="divideName != null and divideName != ''">
- AND divi.name LIKE CONCAT('%', #{divideName}, '%')
+ <if test = "divideId != null">
+ AND divi.id = #{divideId}
</if>
- <if test="blockName != null and blockName != ''">
- AND blo.name LIKE CONCAT('%', #{blockName}, '%')
+ <if test = "blockId != null">
+ AND blo.id = #{blockId}
</if>
<if test="isBinded == 0">
@@ -252,10 +252,17 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍙栨按鍙ｈ褰�-->
<select id="getIntakes" resultType="com.dy.pipIrrGlobal.voPr.VoIntake">
- SELECT CAST(ge.id AS char) AS id,
+ SELECT
+ CAST(ge.id AS char) AS intakeId,
ge.`name` AS intakeName,
+ CAST(divi.id AS char) AS divideId,
divi.`name` AS divideName,
+ CAST(blo.id AS char) AS blockId,
blo.`name` AS blockName,
+ ge.lng,
+ ge.lat,
+ ge.remarks,
+ ge.operator,
ge.operateDt As operateDt,
(CASE
WHEN ge.id NOT IN(SELECT intakeId FROM pr_controller where deleted = 0) THEN "鏈粦瀹�"
@@ -276,12 +283,12 @@
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
- <if test="divideName != null and divideName != ''">
- AND divi.name LIKE CONCAT('%', #{divideName}, '%')
+ <if test = "divideId != null">
+ AND divi.id = #{divideId}
</if>
- <if test="blockName != null and blockName != ''">
- AND blo.name LIKE CONCAT('%', #{blockName}, '%')
+ <if test = "blockId != null">
+ AND blo.id = #{blockId}
</if>
<if test="isBinded == 0">
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java
index c6d47b1..e56ba28 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java
@@ -23,10 +23,10 @@
public String intakeName;
@Schema(description = "鎵�灞炲垎姘存埧")
- public String divideName;
+ public String divideId;
@Schema(description = "鎵�灞炵墖鍖�")
- public String blockName;
+ public String blockId;
@Schema(description = "鏄惁缁戝畾璁惧")
//0鏈粦瀹� 1宸茬粦瀹�
--
Gitblit v1.8.0