From 5b932773f092fb65ced9cb5d6b3c0cf9aca6174e Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 26 四月 2024 10:55:57 +0800
Subject: [PATCH] 修改 分水房查询接口 增加修改查询的数据内容
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 21 ++++++++++++++-------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java | 32 +++++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
index 207d0d9..1a2d8af 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
@@ -41,7 +41,7 @@
@Schema(title = "鎵�灞炵墖鍖�")
@ExcelProperty("鎵�灞炵墖鍖�")
@ColumnWidth(15)
- private String blockName;
+ private String blockId;
@Schema(title = "璐熻矗浜�")
@ExcelProperty("璐熻矗浜�")
@@ -58,9 +58,39 @@
@ColumnWidth(25)
private String address;
+ @Schema(title = "瑕嗙洊鏉�")
+ @ExcelProperty("瑕嗙洊鏉�")
+ @ColumnWidth(25)
+ private String villages;
+
+ @Schema(title = "瑕嗙洊闈㈢Н")
+ @ExcelProperty("瑕嗙洊闈㈢Н")
+ @ColumnWidth(25)
+ private String area;
+
+ @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/PrDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
index 7a5d5f3..a33f952 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -238,7 +238,7 @@
SELECT
COUNT(*) AS recordCount
FROM pr_divide divi
- INNER JOIN ba_block blo ON divi.blockId = blo.id
+<!-- INNER JOIN ba_block blo ON divi.blockId = blo.id-->
INNER JOIN ba_district country ON divi.countyId = country.id
INNER JOIN ba_district town ON divi.townId = town.id
INNER JOIN ba_district village ON divi.villageid = village.id
@@ -249,8 +249,8 @@
AND divi.name LIKE CONCAT('%',#{divideName},'%')
</if>
- <if test = "blockName != null and blockName !=''">
- AND blo.name = #{blockName}
+ <if test = "blockId != null and blockId !=''">
+ AND divi.blockId = #{blockId}
</if>
</where>
</select>
@@ -261,13 +261,20 @@
(@i:=@i+1) AS id,
CAST(divi.id AS char) AS divideId,
divi.name AS divideName,
- blo.`name` AS blockName,
+ CAST(divi.blockId AS char) AS blockId,
+<!-- blo.`name` AS blockName,-->
divi.header,
+ divi.villages,
+ divi.area,
+ divi.lng,
+ divi.lat,
divi.phone,
+ divi.remarks,
CONCAT(country.`name`, town.`name`, village.`name`) AS address,
+ CAST(divi.operator AS char) AS operator,
divi.operateDt
FROM pr_divide divi
- INNER JOIN ba_block blo ON divi.blockId = blo.id
+<!-- INNER JOIN ba_block blo ON divi.blockId = blo.id-->
INNER JOIN ba_district country ON divi.countyId = country.id
INNER JOIN ba_district town ON divi.townId = town.id
INNER JOIN ba_district village ON divi.villageid = village.id
@@ -278,8 +285,8 @@
AND divi.name LIKE CONCAT('%',#{divideName},'%')
</if>
- <if test = "blockName != null and blockName !=''">
- AND blo.name = #{blockName}
+ <if test = "blockId != null and blockId !=''">
+ AND divi.blockId = #{blockId}
</if>
</where>
ORDER BY divi.operateDt DESC
--
Gitblit v1.8.0