2024-09-10 朱宝民 调整片区、分水房二级联动返回值

zhubaomin

2024-09-10 79bca5f85b6c53a5efa185d0590dda924500fdae

2024-09-10 朱宝民 调整片区、分水房二级联动返回值

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoSimpleDivide.java

@@ -19,10 +19,10 @@
     * 分水房ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long divideId;
    private Long value;

    /**
     * 分水房名称
     */
    private String divideName;
    private String label;
}

 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>

 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<>());