From 5d518a1bbbfea15a8179542909d92566d052f6f3 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 24 Oct 2024 14:31:10 +0800
Subject: [PATCH] jar 包名称修改
---
src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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..9095569 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>
@@ -41,7 +42,7 @@
<!--查询校内建筑列表-->
<select id="selectList" resultType="java.util.HashMap">
- SELECT id, mechanismName as mechanismname, tpUrl as tpurl
+ SELECT *
FROM `sys_architecture`
WHERE campus = #{campus}
and type = #{type}
@@ -66,7 +67,9 @@
heading,
pitch,
roll,
- panoramaurl
+ panoramaurl,
+ address_name,
+ x
FROM `sys_architecture`
WHERE id = #{id}
and is_deleted = 0
@@ -79,14 +82,14 @@
WHERE panoramaurl IS NOT NULL
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 id="selectArchALL" resultType="org.springblade.modules.architecture.entity.Architecture">
+ SELECT id,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
+ <if test="architecture.campus!=null and architecture.campus!=''">
+ and campus = #{architecture.campus}
+ </if>
</select>
<select id="selectIns" resultType="java.lang.String">
@@ -144,6 +147,8 @@
introduce,
jd,
wd,
+ x,
+ y,
gd,
tpUrl as tpurl,
codeUrl as codeurl,
@@ -154,6 +159,7 @@
panoramaurl
FROM sys_architecture
WHERE mechanismName LIKE '%${mechanismName}%'
+ and campus = #{campus}
AND is_deleted = 0
UNION
SELECT mechanismName AS mechanismname,
@@ -162,6 +168,8 @@
introduce,
jd,
wd,
+ x,
+ y,
gd,
tpUrl as tpurl,
codeUrl as codeurl,
@@ -172,6 +180,7 @@
panoramaurl
FROM sys_mechanism
WHERE mechanismName LIKE '%${mechanismName}%'
+ and campus = #{campus}
AND is_deleted = 0
UNION
SELECT mechanismName AS mechanismname,
@@ -180,6 +189,8 @@
introduce,
jd,
wd,
+ x,
+ y,
gd,
tpUrl as tpurl,
codeUrl as codeurl,
@@ -190,6 +201,7 @@
panoramaurl
FROM sys_life
WHERE mechanismName LIKE '%${mechanismName}%'
+ and campus = #{campus}
AND is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3