From 592a06ce92ee99abb5fee41437c1d0a834106cb9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 04 Aug 2022 15:22:59 +0800
Subject: [PATCH] 修改返回信息

---
 src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
index 8b9d722..d57503d 100644
--- a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
+++ b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
@@ -21,6 +21,7 @@
         <result column="pitch" property="pitch"/>
         <result column="roll" property="roll"/>
         <result column="panoramaurl" property="panoramaurl"/>
+        <result column="address_name" property="addressName"/>
     </resultMap>
 
 
@@ -66,7 +67,9 @@
                heading,
                pitch,
                roll,
-               panoramaurl
+               panoramaurl,
+               address_name,
+               x
         FROM `sys_architecture`
         WHERE id = #{id}
           and is_deleted = 0
@@ -80,13 +83,13 @@
           AND panoramaurl!='' and is_deleted = 0
     </select>
     <select id="selectArchALL" resultType="java.util.HashMap">
-        SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
+        SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl,x
         FROM sys_architecture
         WHERE is_deleted = 0
-        UNION
-        SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
-        FROM sys_mechanism
-        WHERE is_deleted = 0
+        --         UNION
+--         SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
+--         FROM sys_mechanism
+--         WHERE is_deleted = 0
     </select>
 
     <select id="selectIns" resultType="java.lang.String">
@@ -144,6 +147,8 @@
                introduce,
                jd,
                wd,
+               x,
+               y,
                gd,
                tpUrl         as tpurl,
                codeUrl       as codeurl,
@@ -162,6 +167,8 @@
                introduce,
                jd,
                wd,
+               x,
+               y,
                gd,
                tpUrl         as tpurl,
                codeUrl       as codeurl,
@@ -180,6 +187,8 @@
                introduce,
                jd,
                wd,
+               x,
+               y,
                gd,
                tpUrl         as tpurl,
                codeUrl       as codeurl,

--
Gitblit v1.9.3