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
755b62dc
Commit
755b62dc
authored
Dec 18, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
载体添加主导产业筛选
parent
8675464e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
3 deletions
+22
-3
CarrierPageDto.java
...m/postcard/service/moudle/carrier/dto/CarrierPageDto.java
+6
-0
CarrierInfoServiceImpl.java
...e/moudle/carrier/service/impl/CarrierInfoServiceImpl.java
+11
-3
CarrierInfoMapper.xml
src/main/resources/mapper/carrier/CarrierInfoMapper.xml
+5
-0
No files found.
src/main/java/com/postcard/service/moudle/carrier/dto/CarrierPageDto.java
View file @
755b62dc
...
@@ -47,5 +47,11 @@ public class CarrierPageDto {
...
@@ -47,5 +47,11 @@ public class CarrierPageDto {
@ApiModelProperty
(
hidden
=
true
)
@ApiModelProperty
(
hidden
=
true
)
private
Integer
parkId
;
private
Integer
parkId
;
//主导产业
@ApiModelProperty
(
value
=
"主导产业"
)
private
String
primaryIndustry
;
@ApiModelProperty
(
hidden
=
true
)
private
List
<
String
>
primaryIndustryList
;
}
}
src/main/java/com/postcard/service/moudle/carrier/service/impl/CarrierInfoServiceImpl.java
View file @
755b62dc
...
@@ -17,6 +17,7 @@ import com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo;
...
@@ -17,6 +17,7 @@ import com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo;
import
com.postcard.service.moudle.carrier.vo.CarrierPageVo
;
import
com.postcard.service.moudle.carrier.vo.CarrierPageVo
;
import
com.postcard.service.moudle.carrier.vo.CarrierParkVo
;
import
com.postcard.service.moudle.carrier.vo.CarrierParkVo
;
import
com.postcard.service.moudle.park.entity.ParkInfo
;
import
com.postcard.service.moudle.park.entity.ParkInfo
;
import
com.postcard.service.moudle.park.enums.PrimaryIndustryEnum
;
import
com.postcard.service.moudle.park.service.ParkInfoService
;
import
com.postcard.service.moudle.park.service.ParkInfoService
;
import
com.postcard.service.moudle.system.entity.SysDictDataEntity
;
import
com.postcard.service.moudle.system.entity.SysDictDataEntity
;
import
com.postcard.service.moudle.system.service.SysCarouselInfoService
;
import
com.postcard.service.moudle.system.service.SysCarouselInfoService
;
...
@@ -80,6 +81,12 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
...
@@ -80,6 +81,12 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
carrierPageDto
.
setCarrierType
(
Arrays
.
asList
(
detail
.
split
(
","
)));
carrierPageDto
.
setCarrierType
(
Arrays
.
asList
(
detail
.
split
(
","
)));
}
}
}
}
//主导产业
if
(
org
.
apache
.
commons
.
lang3
.
StringUtils
.
isNotBlank
(
carrierPageDto
.
getPrimaryIndustry
())){
String
name
=
PrimaryIndustryEnum
.
getName
(
carrierPageDto
.
getPrimaryIndustry
());
String
[]
split
=
name
.
split
(
"、"
);
carrierPageDto
.
setPrimaryIndustryList
(
Arrays
.
asList
(
split
));
}
Page
page
=
CommonUtil
.
getPageFromEntity
(
paramEntity
);
Page
page
=
CommonUtil
.
getPageFromEntity
(
paramEntity
);
carrierPageDto
.
setDevelopmentId
(
developMentId
);
carrierPageDto
.
setDevelopmentId
(
developMentId
);
Page
<
CarrierPageVo
>
result
=
this
.
baseMapper
.
pageList
(
page
,
carrierPageDto
);
Page
<
CarrierPageVo
>
result
=
this
.
baseMapper
.
pageList
(
page
,
carrierPageDto
);
...
@@ -93,10 +100,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
...
@@ -93,10 +100,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
Double
area
=
data
.
getArea
();
Double
area
=
data
.
getArea
();
String
name
=
String
name
=
sj
.
add
(
DataUtil
.
dealProvince
(
provinceName
,
cityName
))
sj
.
add
(
DataUtil
.
dealProvince
(
provinceName
,
cityName
))
.
add
(
data
.
getRegionName
())
.
add
(
ObjectUtils
.
isEmpty
(
data
.
getRegionName
())?
""
:
data
.
getRegionName
())
.
add
(
data
.
getParkName
())
.
add
(
ObjectUtils
.
isEmpty
(
data
.
getParkName
())?
""
:
data
.
getParkName
())
.
add
(
ObjectUtils
.
isEmpty
(
area
)
?
""
:
NumberUtil
.
roundStr
(
area
,
0
)
+
"㎡"
)
.
add
(
ObjectUtils
.
isEmpty
(
area
)
?
""
:
NumberUtil
.
roundStr
(
area
,
0
)
+
"㎡"
)
.
add
(
data
.
getTyp
e
())
.
add
(
ObjectUtils
.
isEmpty
(
data
.
getType
())?
""
:
data
.
getParkNam
e
())
.
toString
();
.
toString
();
name
=
name
.
replace
(
"null"
,
""
);
name
=
name
.
replace
(
"null"
,
""
);
data
.
setName
(
name
);
data
.
setName
(
name
);
...
@@ -104,6 +111,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
...
@@ -104,6 +111,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
}
}
return
result
;
return
result
;
}
}
/**
/**
* @description: 详情
* @description: 详情
* @date: 2023/12/16 15:05
* @date: 2023/12/16 15:05
...
...
src/main/resources/mapper/carrier/CarrierInfoMapper.xml
View file @
755b62dc
...
@@ -65,6 +65,11 @@
...
@@ -65,6 +65,11 @@
<if
test=
"param.parkId != null and param.parkId != ''"
>
<if
test=
"param.parkId != null and param.parkId != ''"
>
AND a.park_id = #{param.parkId}
AND a.park_id = #{param.parkId}
</if>
</if>
<if
test=
"param.primaryIndustryList != null and param.primaryIndustryList.size() > 0 "
>
<foreach
item=
"primaryIndustry"
collection=
"param.primaryIndustryList"
open=
" and ( "
separator=
"or"
close=
")"
>
b.primary_industry like concat('%', #{primaryIndustry}, '%')
</foreach>
</if>
</where>
</where>
order by a.create_time desc
order by a.create_time desc
</select>
</select>
...
...
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