Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
cfld-postcard-service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cfld-backend
cfld-postcard-service
Commits
c1dbd943
Commit
c1dbd943
authored
Dec 19, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
9ab7cc4b
c11790df
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
4 deletions
+13
-4
CarrierPageVo.java
...com/postcard/service/moudle/carrier/vo/CarrierPageVo.java
+2
-0
LandPageVo.java
.../java/com/postcard/service/moudle/land/vo/LandPageVo.java
+2
-0
ParkPageVo.java
.../java/com/postcard/service/moudle/park/vo/ParkPageVo.java
+2
-0
CarrierInfoMapper.xml
src/main/resources/mapper/carrier/CarrierInfoMapper.xml
+2
-1
LandInfoMapper.xml
src/main/resources/mapper/land/LandInfoMapper.xml
+2
-1
ParkInfoMapper.xml
src/main/resources/mapper/park/ParkInfoMapper.xml
+3
-2
No files found.
src/main/java/com/postcard/service/moudle/carrier/vo/CarrierPageVo.java
View file @
c1dbd943
...
@@ -77,4 +77,6 @@ public class CarrierPageVo {
...
@@ -77,4 +77,6 @@ public class CarrierPageVo {
/** 区/县 */
/** 区/县 */
@ApiModelProperty
(
value
=
"区/县"
)
@ApiModelProperty
(
value
=
"区/县"
)
private
String
regionName
;
private
String
regionName
;
@ApiModelProperty
(
value
=
"是否有VR 1-有;0-无"
)
private
Integer
isVr
;
}
}
src/main/java/com/postcard/service/moudle/land/vo/LandPageVo.java
View file @
c1dbd943
...
@@ -62,4 +62,6 @@ public class LandPageVo {
...
@@ -62,4 +62,6 @@ public class LandPageVo {
@ApiModelProperty
(
value
=
"纬度(坐标系gcj02)"
)
@ApiModelProperty
(
value
=
"纬度(坐标系gcj02)"
)
private
BigDecimal
latitude
;
private
BigDecimal
latitude
;
@ApiModelProperty
(
value
=
"是否有VR 1-有;0-无"
)
private
Integer
isVr
;
}
}
src/main/java/com/postcard/service/moudle/park/vo/ParkPageVo.java
View file @
c1dbd943
...
@@ -55,6 +55,8 @@ public class ParkPageVo {
...
@@ -55,6 +55,8 @@ public class ParkPageVo {
@ApiModelProperty
(
value
=
"认证状态名称(1-未认证;2-认证中;3-已认证;4-已拒绝)"
)
@ApiModelProperty
(
value
=
"认证状态名称(1-未认证;2-认证中;3-已认证;4-已拒绝)"
)
private
String
statusName
;
private
String
statusName
;
@ApiModelProperty
(
value
=
"是否有VR 1-有;0-无"
)
private
Integer
isVr
;
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
}
}
src/main/resources/mapper/carrier/CarrierInfoMapper.xml
View file @
c1dbd943
...
@@ -32,7 +32,8 @@
...
@@ -32,7 +32,8 @@
a.img_url,
a.img_url,
a.structure,
a.structure,
b.longitude,
b.longitude,
b.latitude
b.latitude,
exists(select * from sys_carousel_info where association_id = a.id and status = 1 and type = 5 and url_type = 3) as is_vr
from carrier_info a
from carrier_info a
left join park_info b on a.park_id=b.id
left join park_info b on a.park_id=b.id
left join development_info c on c.id=b.zone_id
left join development_info c on c.id=b.zone_id
...
...
src/main/resources/mapper/land/LandInfoMapper.xml
View file @
c1dbd943
...
@@ -60,7 +60,8 @@
...
@@ -60,7 +60,8 @@
b.region_code,
b.region_code,
b.region_name,
b.region_name,
b.longitude,
b.longitude,
b.latitude
b.latitude,
exists(select * from sys_carousel_info where association_id = a.id and status = 1 and type = 4 and url_type = 3) as is_vr
FROM
FROM
development_industrial_land_info a
development_industrial_land_info a
LEFT JOIN development_info b ON a.development_id = b.id
LEFT JOIN development_info b ON a.development_id = b.id
...
...
src/main/resources/mapper/park/ParkInfoMapper.xml
View file @
c1dbd943
...
@@ -105,8 +105,9 @@
...
@@ -105,8 +105,9 @@
province_code, province_name,city_code,
province_code, province_name,city_code,
city_name,region_code,region_name,
city_name,region_code,region_name,
status,primary_industry,level_code,
status,primary_industry,level_code,
level_name,cover_area,img_url,longitude,latitude
level_name,cover_area,img_url,longitude,latitude,
from park_info
exists(select * from sys_carousel_info where association_id = pi.id and status = 1 and type = 2 and url_type = 3 ) as is_vr
from park_info pi
<where>
<where>
1=1
1=1
<if
test=
"param.statusList != null and param.statusList.size() > 0 "
>
<if
test=
"param.statusList != null and param.statusList.size() > 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