Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
80864119
authored
Oct 10, 2023
by
朱淼
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix bug
parent
91f220a8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
3 deletions
server-service/src/main/java/com/makeit/vo/platform/space/PlatBedPanoramaVO.java
server-service/src/main/resources/mappers/PlatBedMapper.xml
server-service/src/main/java/com/makeit/vo/platform/space/PlatBedPanoramaVO.java
View file @
80864119
...
@@ -13,7 +13,9 @@ import lombok.Data;
...
@@ -13,7 +13,9 @@ import lombok.Data;
*/
*/
@Data
@Data
@ApiModel
(
"PlatBedPanoramaVO参数"
)
@ApiModel
(
"PlatBedPanoramaVO参数"
)
public
class
PlatBedPanoramaVO
extends
BaseIdDTO
{
public
class
PlatBedPanoramaVO
{
private
String
id
;
@ApiModelProperty
(
"空间全路径id"
)
@ApiModelProperty
(
"空间全路径id"
)
private
String
spacePath
;
private
String
spacePath
;
...
...
server-service/src/main/resources/mappers/PlatBedMapper.xml
View file @
80864119
...
@@ -3,8 +3,23 @@
...
@@ -3,8 +3,23 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.makeit.mapper.platform.space.PlatBedMapper"
>
<mapper
namespace=
"com.makeit.mapper.platform.space.PlatBedMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.makeit.entity.platform.space.PlatBed"
>
<id
property=
"id"
column=
"id"
jdbcType=
"VARCHAR"
/>
<result
property=
"tenantId"
column=
"tenant_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"name"
column=
"name"
jdbcType=
"VARCHAR"
/>
<result
property=
"roomId"
column=
"room_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"spaceId"
column=
"space_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"status"
column=
"status"
jdbcType=
"VARCHAR"
/>
<result
property=
"sort"
column=
"sort"
jdbcType=
"VARCHAR"
/>
<result
property=
"createDate"
column=
"create_date"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"updateDate"
column=
"update_date"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"update_by"
column=
"update_by"
jdbcType=
"VARCHAR"
/>
<result
property=
"sort"
column=
"sort"
jdbcType=
"VARCHAR"
/>
<result
property=
"delFlag"
column=
"del_flag"
jdbcType=
"CHAR"
/>
</resultMap>
<select
id=
"selectBySpaceIdAndStatus"
resultType=
"com.makeit.vo.platform.space.PlatBedPanoramaVO"
>
<select
id=
"selectBySpaceIdAndStatus"
resultType=
"com.makeit.vo.platform.space.PlatBedPanoramaVO"
>
SELECT pb.id,pb.`status`,pb.name
bedName ,pm.`name` roomName,pm.space_p
ath,pe.name as elderName,pe.id as elderId,pm.id as roomId
SELECT pb.id,pb.`status`,pb.name
as bedName ,pm.`name` as roomName,pm.space_path as spaceP
ath,pe.name as elderName,pe.id as elderId,pm.id as roomId
FROM `plat_bed` pb
FROM `plat_bed` pb
LEFT JOIN plat_room pm on pb.room_id = pm.id
LEFT JOIN plat_room pm on pb.room_id = pm.id
LEFT JOIN plat_elder pe on pe.bed_id = pb.id
LEFT JOIN plat_elder pe on pe.bed_id = pb.id
...
@@ -20,7 +35,7 @@
...
@@ -20,7 +35,7 @@
</select>
</select>
<select
id=
"selectByRoomIdAndStatus"
resultType=
"com.makeit.vo.platform.space.PlatBedPanoramaVO"
>
<select
id=
"selectByRoomIdAndStatus"
resultType=
"com.makeit.vo.platform.space.PlatBedPanoramaVO"
>
SELECT pb.id,pb.`status`,pb.name
bedName ,pm.`name` roomName,pm.space_p
ath,pe.name as elderName,pe.id as elderId,pm.id as roomId
SELECT pb.id,pb.`status`,pb.name
as bedName ,pm.`name` as roomName,pm.space_path as spaceP
ath,pe.name as elderName,pe.id as elderId,pm.id as roomId
FROM `plat_bed` pb
FROM `plat_bed` pb
LEFT JOIN plat_room pm on pb.room_id = pm.id
LEFT JOIN plat_room pm on pb.room_id = pm.id
LEFT JOIN plat_elder pe on pe.bed_id = pb.id and pe.del_flag = 0
LEFT JOIN plat_elder pe on pe.bed_id = pb.id and pe.del_flag = 0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment