From dcfc005ee387ac39de83bd4637f48ed0f8f6c9a9 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 16:23:03 +0800 Subject: [PATCH] 1、修改文档“增加一个单位(orgTa)”名称; 2、config.properties配置改为ym的配置; 3、江海用测试系统调整,适应阿里云服务器环境。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml index 1ce7bb8..8dacf70 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml @@ -2,17 +2,21 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper"> - <select id="intakeInfo" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeBase"> + <select id="intakeInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeBase"> select itb.id as id, itb.name as num, itb.lng as lng, itb.lat as lat, + CONCAT(county.name, town.name, village.name) as address, bb.name as blockName, pc.rtuAddr as rtuAddr from pr_intake itb LEFT JOIN ba_block bb on itb.blockId = bb.id LEFT JOIN pr_controller pc on itb.id = pc.intakeId + LEFT JOIN ba_district county on itb.countyId = county.id + LEFT JOIN ba_district town on itb.townId = town.id + LEFT JOIN ba_district village on itb.villageId = village.id where itb.id = #{intakeId,jdbcType=BIGINT} </select> -- Gitblit v1.8.0