From 79bca5f85b6c53a5efa185d0590dda924500fdae Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 10 九月 2024 09:24:01 +0800
Subject: [PATCH] 2024-09-10 朱宝民 调整片区、分水房二级联动返回值
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 4 ++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoSimpleDivide.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoSimpleDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoSimpleDivide.java
index e54c9f3..421feba 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoSimpleDivide.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoSimpleDivide.java
@@ -19,10 +19,10 @@
* 鍒嗘按鎴縄D
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- private Long divideId;
+ private Long value;
/**
* 鍒嗘按鎴垮悕绉�
*/
- private String divideName;
+ private String label;
}
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 e435175..1348a36 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -315,8 +315,8 @@
<!--鏍规嵁鐗囧尯ID鑾峰彇鍒嗘按鎴垮垪琛�-->
<select id="getDividesByBlockId" resultType="com.dy.pipIrrGlobal.voPr.VoSimpleDivide">
SELECT
- id As divideId,
- name AS divideName
+ id As value,
+ name AS label
FROM pr_divide
WHERE deleted = 0 AND blockId = #{blockId}
</select>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
index 8d0b720..2c67b73 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -234,7 +234,7 @@
for (int i = 0; i < array_blocks.size(); i++) {
JSONObject job_block = array_blocks.getJSONObject(i);
JSONObject job_blockNew = new JSONObject();
- job_blockNew.put("value", job_block.getLong("id"));
+ job_blockNew.put("value", job_block.getLong("id").toString());
job_blockNew.put("label", job_block.getString("name"));
List<VoSimpleDivide> list_divides = Optional.ofNullable( prDivideMapper.getDividesByBlockId(job_block.getLong("id"))).orElse(new ArrayList<>());
--
Gitblit v1.8.0