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
2574a97c
Commit
2574a97c
authored
Dec 18, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
载体添加主导产业筛选
parent
755b62dc
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
95 additions
and
0 deletions
+95
-0
CarrierInfoMapper.java
...card/service/moudle/carrier/mapper/CarrierInfoMapper.java
+3
-0
CarrierInfoService.java
...rd/service/moudle/carrier/service/CarrierInfoService.java
+11
-0
CarrierInfoServiceImpl.java
...e/moudle/carrier/service/impl/CarrierInfoServiceImpl.java
+57
-0
DevelopmentInfoServiceImpl.java
.../development/service/impl/DevelopmentInfoServiceImpl.java
+16
-0
StarObjectExtensionInfoVO.java
...tartObjectExtensionInfo/VO/StarObjectExtensionInfoVO.java
+8
-0
No files found.
src/main/java/com/postcard/service/moudle/carrier/mapper/CarrierInfoMapper.java
View file @
2574a97c
...
@@ -8,6 +8,8 @@ import com.postcard.service.moudle.carrier.vo.CarrierPageVo;
...
@@ -8,6 +8,8 @@ import com.postcard.service.moudle.carrier.vo.CarrierPageVo;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
/**
* @author: zhouxudong
* @author: zhouxudong
* @version: 1.0
* @version: 1.0
...
@@ -18,6 +20,7 @@ import org.apache.ibatis.annotations.Param;
...
@@ -18,6 +20,7 @@ import org.apache.ibatis.annotations.Param;
public
interface
CarrierInfoMapper
extends
BaseMapper
<
CarrierInfo
>
{
public
interface
CarrierInfoMapper
extends
BaseMapper
<
CarrierInfo
>
{
Page
<
CarrierPageVo
>
pageList
(
Page
page
,
@Param
(
"param"
)
CarrierPageDto
carrierPageDto
);
Page
<
CarrierPageVo
>
pageList
(
Page
page
,
@Param
(
"param"
)
CarrierPageDto
carrierPageDto
);
List
<
CarrierPageVo
>
pageList
(
@Param
(
"param"
)
CarrierPageDto
carrierPageDto
);
}
}
...
...
src/main/java/com/postcard/service/moudle/carrier/service/CarrierInfoService.java
View file @
2574a97c
...
@@ -8,6 +8,8 @@ import com.postcard.service.moudle.carrier.entity.CarrierInfo;
...
@@ -8,6 +8,8 @@ import com.postcard.service.moudle.carrier.entity.CarrierInfo;
import
com.postcard.service.moudle.carrier.vo.CarrierDetailVo
;
import
com.postcard.service.moudle.carrier.vo.CarrierDetailVo
;
import
com.postcard.service.moudle.carrier.vo.CarrierPageVo
;
import
com.postcard.service.moudle.carrier.vo.CarrierPageVo
;
import
java.util.List
;
/**
/**
* @author: zhouxudong
* @author: zhouxudong
* @version: 1.0
* @version: 1.0
...
@@ -23,6 +25,15 @@ public interface CarrierInfoService extends IService<CarrierInfo> {
...
@@ -23,6 +25,15 @@ public interface CarrierInfoService extends IService<CarrierInfo> {
* @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.moudle.carrier.vo.CarrierPageVo>
* @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.moudle.carrier.vo.CarrierPageVo>
**/
**/
Page
<
CarrierPageVo
>
pageList
(
ParamEntity
<
CarrierPageDto
>
carrierPageDto
);
Page
<
CarrierPageVo
>
pageList
(
ParamEntity
<
CarrierPageDto
>
carrierPageDto
);
/**
* @description: 不分页载体信息
* @date: 2023/11/23 17:58
* @param: [carrierPageDto]
* @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.moudle.carrier.vo.CarrierPageVo>
**/
List
<
CarrierPageVo
>
list
(
CarrierPageDto
carrierPageDto
);
/**
/**
* @description: 详情
* @description: 详情
* @date: 2023/11/23 17:58
* @date: 2023/11/23 17:58
...
...
src/main/java/com/postcard/service/moudle/carrier/service/impl/CarrierInfoServiceImpl.java
View file @
2574a97c
...
@@ -112,6 +112,63 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
...
@@ -112,6 +112,63 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
return
result
;
return
result
;
}
}
/**
* @description: 全部列表查询
* @date: 2023/11/23 14:47
* @param: [carrierPageDto]
* @return:
* com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.moudle.carrier.vo.CarrierPageVo>
*/
@Override
public
List
<
CarrierPageVo
>
list
(
CarrierPageDto
carrierPageDto
)
{
String
carrierArea
=
carrierPageDto
.
getCarrierArea
();
if
(
StringUtils
.
isNotBlank
(
carrierArea
))
{
String
[]
split
=
carrierArea
.
split
(
"-"
);
carrierPageDto
.
setLowCarrierArea
(
Double
.
valueOf
(
split
[
0
]));
if
(
split
.
length
>
1
)
{
carrierPageDto
.
setHighCarrierArea
(
Double
.
valueOf
(
split
[
1
]));
}
}
// 映射字段
String
carrierType
=
carrierPageDto
.
getTypeInfo
();
if
(
StringUtils
.
isNotBlank
(
carrierType
))
{
Map
<
String
,
SysDictDataEntity
>
dictDataEntityMap
=
this
.
sysDictDataService
.
listByCode
(
DictCodeEnum
.
CARRIER_TYPE
.
getCode
());
SysDictDataEntity
sysDictDataEntity
=
dictDataEntityMap
.
get
(
carrierType
);
if
(
ObjectUtils
.
isNotEmpty
(
sysDictDataEntity
))
{
String
detail
=
sysDictDataEntity
.
getDetail
();
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
));
}
carrierPageDto
.
setDevelopmentId
(
developMentId
);
List
<
CarrierPageVo
>
records
=
this
.
baseMapper
.
pageList
(
carrierPageDto
);
if
(!
CollectionUtils
.
isEmpty
(
records
))
{
records
.
forEach
(
data
->
{
StringJoiner
sj
=
new
StringJoiner
(
""
);
String
provinceName
=
data
.
getProvinceName
();
String
cityName
=
data
.
getCityName
();
Double
area
=
data
.
getArea
();
String
name
=
sj
.
add
(
DataUtil
.
dealProvince
(
provinceName
,
cityName
))
.
add
(
ObjectUtils
.
isEmpty
(
data
.
getRegionName
())?
""
:
data
.
getRegionName
())
.
add
(
ObjectUtils
.
isEmpty
(
data
.
getParkName
())?
""
:
data
.
getParkName
())
.
add
(
ObjectUtils
.
isEmpty
(
area
)
?
""
:
NumberUtil
.
roundStr
(
area
,
0
)
+
"㎡"
)
.
add
(
ObjectUtils
.
isEmpty
(
data
.
getType
())?
""
:
data
.
getParkName
())
.
toString
();
name
=
name
.
replace
(
"null"
,
""
);
data
.
setName
(
name
);
});
}
return
records
;
}
/**
/**
* @description: 详情
* @description: 详情
* @date: 2023/12/16 15:05
* @date: 2023/12/16 15:05
...
...
src/main/java/com/postcard/service/moudle/development/service/impl/DevelopmentInfoServiceImpl.java
View file @
2574a97c
...
@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...
@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.postcard.service.enums.CarouselTypeEnum
;
import
com.postcard.service.enums.CarouselTypeEnum
;
import
com.postcard.service.enums.StatusEnum
;
import
com.postcard.service.enums.StatusEnum
;
import
com.postcard.service.moudle.carrier.dto.CarrierPageDto
;
import
com.postcard.service.moudle.carrier.service.CarrierInfoService
;
import
com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo
;
import
com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo
;
import
com.postcard.service.moudle.development.entity.DevelopmentIndustryPolicyInfo
;
import
com.postcard.service.moudle.development.entity.DevelopmentIndustryPolicyInfo
;
import
com.postcard.service.moudle.development.entity.DevelopmentInfo
;
import
com.postcard.service.moudle.development.entity.DevelopmentInfo
;
...
@@ -73,6 +75,8 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
...
@@ -73,6 +75,8 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
@Autowired
StarObjectExtensionInfoService
starObjectExtensionInfoService
;
@Autowired
StarObjectExtensionInfoService
starObjectExtensionInfoService
;
@Autowired
ScSourceInfoService
scSourceInfoService
;
@Autowired
ScSourceInfoService
scSourceInfoService
;
@Autowired
CarrierInfoService
carrierInfoService
;
@Value
(
"${development.id}"
)
@Value
(
"${development.id}"
)
private
Integer
developMentId
;
private
Integer
developMentId
;
...
@@ -159,7 +163,19 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
...
@@ -159,7 +163,19 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
//产业情况 区域亮点
//产业情况 区域亮点
Map
<
String
,
List
<
StarObjectExtensionInfoVO
>>
detail
=
starObjectExtensionInfoService
.
detail
(
developMentId
);
Map
<
String
,
List
<
StarObjectExtensionInfoVO
>>
detail
=
starObjectExtensionInfoService
.
detail
(
developMentId
);
developmentDetailVo
.
setInvestmentLights
(
detail
.
get
(
FactorCostEnum
.
LIGHT
.
getName
()));
developmentDetailVo
.
setInvestmentLights
(
detail
.
get
(
FactorCostEnum
.
LIGHT
.
getName
()));
List
<
StarObjectExtensionInfoVO
>
starObjectExtensionInfoVOS
=
detail
.
get
(
FactorCostEnum
.
INDUSRTY
.
getName
());
starObjectExtensionInfoVOS
.
forEach
(
e
->{
CarrierPageDto
carrierPageDto
=
new
CarrierPageDto
();
carrierPageDto
.
setDevelopmentId
(
developMentId
);
carrierPageDto
.
setPrimaryIndustry
(
e
.
getTitle
());
e
.
setCarrirList
(
carrierInfoService
.
list
(
carrierPageDto
));
});
developmentDetailVo
.
setPrimaryIndustrys
(
detail
.
get
(
FactorCostEnum
.
INDUSRTY
.
getName
()));
developmentDetailVo
.
setPrimaryIndustrys
(
detail
.
get
(
FactorCostEnum
.
INDUSRTY
.
getName
()));
//要素成本
//要素成本
LambdaQueryWrapper
<
ScSourceInfoEntity
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
ScSourceInfoEntity
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
lambdaQueryWrapper
.
eq
(
ScSourceInfoEntity:
:
getDevelopmentId
,
developMentId
);
lambdaQueryWrapper
.
eq
(
ScSourceInfoEntity:
:
getDevelopmentId
,
developMentId
);
...
...
src/main/java/com/postcard/service/moudle/startObjectExtensionInfo/VO/StarObjectExtensionInfoVO.java
View file @
2574a97c
package
com
.
postcard
.
service
.
moudle
.
startObjectExtensionInfo
.
VO
;
package
com
.
postcard
.
service
.
moudle
.
startObjectExtensionInfo
.
VO
;
import
com.postcard.service.moudle.carrier.vo.CarrierPageVo
;
import
lombok.Data
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.List
;
/**
/**
*
*
...
@@ -28,5 +30,10 @@ public class StarObjectExtensionInfoVO implements Serializable {
...
@@ -28,5 +30,10 @@ public class StarObjectExtensionInfoVO implements Serializable {
*/
*/
private
String
titleIntroduce
;
private
String
titleIntroduce
;
/**
* 介绍
*/
private
List
<
CarrierPageVo
>
carrirList
;
}
}
\ No newline at end of file
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