Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
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
fulixin
dsk-operate-sys-cscec
Commits
5a8b070c
Commit
5a8b070c
authored
Dec 14, 2023
by
施翔轲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
咨询机构管理(项目列表+企业列表)
parent
771481f3
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
658 additions
and
28 deletions
+658
-28
AdvisoryBodyManageController.java
...om/dsk/cscec/controller/AdvisoryBodyManageController.java
+31
-18
DProject.java
...-biz-api/src/main/java/com/dsk/cscec/domain/DProject.java
+6
-5
SysAdvisoryBody.java
...i/src/main/java/com/dsk/cscec/domain/SysAdvisoryBody.java
+97
-0
AdvisoryBodySearchBo.java
...in/java/com/dsk/cscec/domain/bo/AdvisoryBodySearchBo.java
+34
-0
ProjectSearchBo.java
...rc/main/java/com/dsk/cscec/domain/bo/ProjectSearchBo.java
+68
-0
AdvisoryBodySearchVo.java
...in/java/com/dsk/cscec/domain/vo/AdvisoryBodySearchVo.java
+51
-0
ProjectSearchVo.java
...rc/main/java/com/dsk/cscec/domain/vo/ProjectSearchVo.java
+84
-0
DProjectMapper.java
...pi/src/main/java/com/dsk/cscec/mapper/DProjectMapper.java
+9
-1
SysAdvisoryBodyMapper.java
...main/java/com/dsk/cscec/mapper/SysAdvisoryBodyMapper.java
+30
-0
IDProjectService.java
...src/main/java/com/dsk/cscec/service/IDProjectService.java
+23
-1
SysAdvisoryBodyService.java
...in/java/com/dsk/cscec/service/SysAdvisoryBodyService.java
+15
-0
IDProjectServiceImpl.java
...java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
+148
-2
SysAdvisoryBodyServiceImpl.java
...om/dsk/cscec/service/impl/SysAdvisoryBodyServiceImpl.java
+19
-0
DProjectMapper.xml
...iz-api/src/main/resources/mapper/cscec/DProjectMapper.xml
+16
-1
SysAdvisoryBodyMapper.xml
...src/main/resources/mapper/cscec/SysAdvisoryBodyMapper.xml
+27
-0
No files found.
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/
DProject
Controller.java
→
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/
AdvisoryBodyManage
Controller.java
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
controller
;
package
com
.
dsk
.
cscec
.
controller
;
import
com.dsk.common.core.controller.BaseController
;
import
com.dsk.common.core.controller.BaseController
;
import
com.dsk.common.core.domain.PageQuery
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.cscec.domain.bo.AdvisoryBodySearchBo
;
import
com.dsk.cscec.domain.bo.ProjectSearchBo
;
import
com.dsk.cscec.domain.vo.AdvisoryBodySearchVo
;
import
com.dsk.cscec.domain.vo.ProjectSearchVo
;
import
com.dsk.cscec.service.IDProjectService
;
import
com.dsk.cscec.service.IDProjectService
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
/**
/**
*
项目维表(DProject)表
控制层
*
咨询机构管理
控制层
*
*
* @author
makejava
* @author
sxk
* @since 2023-12-10 15:34:46
* @since 2023-12-10 15:34:46
*/
*/
@RestController
@RestController
@RequestMapping
(
"
dProject
"
)
@RequestMapping
(
"
advisory/body
"
)
public
class
DProject
Controller
extends
BaseController
{
public
class
AdvisoryBodyManage
Controller
extends
BaseController
{
/**
/**
* 服务对象
* 服务对象
*/
*/
@Resource
@Resource
private
IDProjectService
IDProjectService
;
private
IDProjectService
baseService
;
/**
* 获取所有项目列表数据
*/
@GetMapping
(
"/getProjectList"
)
public
TableDataInfo
<
ProjectSearchVo
>
getProjectList
(
ProjectSearchBo
projectSearchBo
,
PageQuery
pageQuery
)
{
return
baseService
.
queryProjectList
(
projectSearchBo
,
pageQuery
);
}
/**
* 获取所有企业列表(咨询机构)数据
*/
@GetMapping
(
"/getAdvisoryBodyList"
)
public
TableDataInfo
<
AdvisoryBodySearchVo
>
getAdvisoryBodyList
(
AdvisoryBodySearchBo
advisoryBodySearchBo
,
PageQuery
pageQuery
)
{
return
baseService
.
queryAdvisoryBodyList
(
advisoryBodySearchBo
,
pageQuery
);
}
///**
// * 分页查询所有数据
// *
// * @param page 分页对象
// * @param dProject 查询实体
// * @return 所有数据
// */
//@GetMapping
//public R selectAll(Page<DProject> page, DProject dProject) {
// return success(this.dProjectService.page(page, new QueryWrapper<>(dProject)));
//}
//
//
///**
///**
// * 通过主键查询单条数据
// * 通过主键查询单条数据
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/DProject.java
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
domain
;
package
com
.
dsk
.
cscec
.
domain
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
/**
/**
* 项目维表(DProject)表实体类
* 项目维表(DProject)表实体类
*
*
* @author sxk
* @author sxk
* @since 2023-12-10 15:34:49
* @since 2023-12-10 15:34:49
*/
*/
@SuppressWarnings
(
"serial"
)
@Data
public
class
DProject
extends
Model
<
DProject
>
{
public
class
DProject
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
//项目主键
//项目主键
private
Long
projectKey
;
private
Long
projectKey
;
//项目ID
//项目ID
...
@@ -405,6 +407,5 @@ public class DProject extends Model<DProject> {
...
@@ -405,6 +407,5 @@ public class DProject extends Model<DProject> {
private
String
projectHrScale
;
private
String
projectHrScale
;
//数据更新时间
//数据更新时间
private
Date
loadTime
;
private
Date
loadTime
;
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/SysAdvisoryBody.java
0 → 100644
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
domain
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 咨询机构(SysAdvisoryBody)表实体类
*
* @author sxk
* @since 2023-12-12 10:12:06
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
SysAdvisoryBody
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 咨询机构ID
*/
@TableId
(
value
=
"advisory_body_id"
)
private
Long
advisoryBodyId
;
/**
* 咨询机构cid(用于查询建设库数据)
*/
private
Integer
advisoryBodyCid
;
/**
* 项目主键(用作关联d_project)
*/
private
Long
projectKey
;
/**
* 咨询机构名称
*/
private
String
advisoryBodyName
;
/**
* 法人代表
*/
private
String
legalPerson
;
/**
* 法人联系电话
*/
private
String
legalPersonPhone
;
/**
* 注册地址
*/
private
String
regAddress
;
/**
* 项目负责人
*/
private
String
projectLeader
;
/**
* 项目负责人专业
*/
private
String
projectLeaderMajor
;
/**
* 项目负责人联系电话
*/
private
String
projectLeaderPhone
;
/**
* 结算开始时间
*/
private
Date
settleStarTime
;
/**
* 结算完成时间
*/
private
Date
settleFinishTime
;
/**
* 是否为终审单位(0代表是 1代表否)
*/
private
String
isFinalJudgeUnit
;
/**
* 创建者
*/
private
String
createBy
;
/**
* 创建时间
*/
private
Date
createTime
;
/**
* 更新者
*/
private
String
updateBy
;
/**
* 更新时间
*/
private
Date
updateTime
;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AdvisoryBodySearchBo.java
0 → 100644
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
domain
.
bo
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.util.Date
;
/**
* @author sxk
* @date 2023.12.13
* @time 10:33
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
AdvisoryBodySearchBo
{
/**
* 咨询机构名称
*/
private
String
advisoryBodyName
;
/**
* 最小最近合作时间
*/
private
Date
minLastCooperateDate
;
/**
* 最大最近合作时间
*/
private
Date
maxLastCooperateDate
;
/**
* 经营范围
*/
private
String
businessScope
;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/ProjectSearchBo.java
0 → 100644
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
domain
.
bo
;
import
lombok.Data
;
import
java.util.Date
;
/**
* @author sxk
* @date 2023.12.11
* @time 14:01
*/
@Data
public
class
ProjectSearchBo
{
/**
* 项目名称
*/
private
String
projectName
;
/**
* 咨询机构名称
*/
private
String
advisoryBodyName
;
/**
* 业主单位
*/
private
String
ownerUnit
;
/**
* 承接项目单位
*/
private
String
undertakeProjectUnit
;
/**
* 项目创建开始时间
*/
private
Date
projectStartTime
;
/**
* 项目创建结束时间
*/
private
Date
projectEndTime
;
/**
* 项目承接类型
*/
private
String
projectUndertakeType
;
/**
* 工程基础大类
*/
private
String
engineeringFoundationCategory
;
/**
* 工程类别明细
*/
private
String
engineeringCategoryDetail
;
/**
* 最小合同金额
*/
private
Double
minContractAmount
;
/**
* 最大合同金额
*/
private
Double
maxContractAmount
;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodySearchVo.java
0 → 100644
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
domain
.
vo
;
import
com.dsk.cscec.domain.SysAdvisoryBody
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.util.Date
;
/**
* @author sxk
* @date 2023.12.13
* @time 10:32
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
AdvisoryBodySearchVo
extends
SysAdvisoryBody
{
/**
* 最近一次合作时间
*/
private
Date
lastCooperateTime
;
/**
* 经营状态
*/
private
String
businessStatus
;
/**
* 法定代表人
*/
private
String
corporatePerson
;
/**
* 注册资本
*/
private
String
regCapital
;
/**
* 注册地区
*/
private
String
regArea
;
/**
* 成立日期
*/
private
String
registeredDate
;
/**
* 经营范围
*/
private
String
businessScope
;
/**
* 合作项目数量
*/
private
Long
cooperateProjectCount
;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/ProjectSearchVo.java
0 → 100644
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
domain
.
vo
;
import
com.dsk.cscec.domain.SysAdvisoryBody
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
* @author sxk
* @date 2023.12.11
* @time 14:01
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public
class
ProjectSearchVo
{
/**
* 项目主键
*/
private
Long
projectKey
;
/**
* 项目ID
*/
private
String
projectId
;
/**
* 项目名称
*/
private
String
projectName
;
/**
* 项目编码
*/
private
String
projectCode
;
/**
* 省市
*/
private
String
provinceName
;
/**
* 项目承接类型
*/
private
String
isinvestproject
;
/**
* 工程基础大类
*/
private
String
projectType1
;
/**
* 工程类别明细
*/
private
String
projectType
;
/**
* 合同金额
*/
private
BigDecimal
contractOrigValue
;
/**
* 业主单位
*/
private
String
ownerName
;
/**
* 项目承接单位
*/
private
String
contractOrgName
;
/**
* 咨询机构(咨询机构表)
*/
private
SysAdvisoryBody
advisoryBody
;
/**
* 创建时间
*/
private
Date
loadTime
;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DProjectMapper.java
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
mapper
;
package
com
.
dsk
.
cscec
.
mapper
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.toolkit.Constants
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.dsk.cscec.domain.DProject
;
import
com.dsk.cscec.domain.DProject
;
import
com.dsk.cscec.domain.vo.ProjectSearchVo
;
import
org.apache.ibatis.annotations.Param
;
/**
/**
* 项目维表(DProject)表数据库访问层
* 项目维表(DProject)表数据库访问层
...
@@ -10,6 +15,9 @@ import com.dsk.cscec.domain.DProject;
...
@@ -10,6 +15,9 @@ import com.dsk.cscec.domain.DProject;
* @since 2023-12-10 15:34:46
* @since 2023-12-10 15:34:46
*/
*/
public
interface
DProjectMapper
extends
BaseMapper
<
DProject
>
{
public
interface
DProjectMapper
extends
BaseMapper
<
DProject
>
{
/**
* 获取所有项目列表数据
*/
Page
<
ProjectSearchVo
>
selectPageProjectList
(
@Param
(
"page"
)
Page
<
ProjectSearchVo
>
page
,
@Param
(
Constants
.
WRAPPER
)
Wrapper
<
DProject
>
queryWrapper
);
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/SysAdvisoryBodyMapper.java
0 → 100644
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
mapper
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.toolkit.Constants
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.dsk.cscec.domain.SysAdvisoryBody
;
import
com.dsk.cscec.domain.vo.AdvisoryBodySearchVo
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.Date
;
/**
* 咨询机构(SysAdvisoryBody)表数据库访问层
*
* @author sxk
* @since 2023-12-12 10:12:04
*/
public
interface
SysAdvisoryBodyMapper
extends
BaseMapper
<
SysAdvisoryBody
>
{
/**
* 查询最近一次合作时间
*/
Date
selectLastCooperateTime
(
@Param
(
"advisoryBodyId"
)
Long
advisoryBodyId
);
/**
* 获取所有企业列表(咨询机构)数据
*/
Page
<
AdvisoryBodySearchVo
>
selectPageAdvisoryBodyList
(
@Param
(
"page"
)
Page
<
AdvisoryBodySearchVo
>
page
,
@Param
(
Constants
.
WRAPPER
)
Wrapper
<
SysAdvisoryBody
>
queryWrapper
);
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDProjectService.java
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
service
;
package
com
.
dsk
.
cscec
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.dsk.common.core.domain.PageQuery
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.cscec.domain.DProject
;
import
com.dsk.cscec.domain.DProject
;
import
com.dsk.cscec.domain.bo.AdvisoryBodySearchBo
;
import
com.dsk.cscec.domain.bo.ProjectSearchBo
;
import
com.dsk.cscec.domain.vo.AdvisoryBodySearchVo
;
import
com.dsk.cscec.domain.vo.ProjectSearchVo
;
/**
/**
* 项目维表(DProject)表服务接口
* 项目维表(DProject)表服务接口
*
*
* @author
makejava
* @author
sxk
* @since 2023-12-10 15:34:51
* @since 2023-12-10 15:34:51
*/
*/
public
interface
IDProjectService
extends
IService
<
DProject
>
{
public
interface
IDProjectService
extends
IService
<
DProject
>
{
/**
* 获取所有项目列表数据
*
* @param projectSearchBo 查询实体
* @param pageQuery 分页对象
* @return 所有数据
*/
TableDataInfo
<
ProjectSearchVo
>
queryProjectList
(
ProjectSearchBo
projectSearchBo
,
PageQuery
pageQuery
);
/**
* 获取所有企业列表(咨询机构)数据
*
* @param advisoryBodySearchBo 查询实体
* @param pageQuery 分页对象
* @return 所有数据
*/
TableDataInfo
<
AdvisoryBodySearchVo
>
queryAdvisoryBodyList
(
AdvisoryBodySearchBo
advisoryBodySearchBo
,
PageQuery
pageQuery
);
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/SysAdvisoryBodyService.java
0 → 100644
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.dsk.cscec.domain.SysAdvisoryBody
;
/**
* 咨询机构(SysAdvisoryBody)表服务接口
*
* @author sxk
* @since 2023-12-12 10:12:09
*/
public
interface
SysAdvisoryBodyService
extends
IService
<
SysAdvisoryBody
>
{
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
service
.
impl
;
package
com
.
dsk
.
cscec
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.dsk.cscec.mapper.DProjectMapper
;
import
com.dsk.common.core.domain.PageQuery
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.utils.StringUtils
;
import
com.dsk.cscec.constant.QueryConstants
;
import
com.dsk.cscec.domain.DProject
;
import
com.dsk.cscec.domain.DProject
;
import
com.dsk.cscec.domain.SysAdvisoryBody
;
import
com.dsk.cscec.domain.bo.AdvisoryBodySearchBo
;
import
com.dsk.cscec.domain.bo.ProjectSearchBo
;
import
com.dsk.cscec.domain.vo.AdvisoryBodySearchVo
;
import
com.dsk.cscec.domain.vo.ProjectSearchVo
;
import
com.dsk.cscec.mapper.DProjectMapper
;
import
com.dsk.cscec.mapper.SysAdvisoryBodyMapper
;
import
com.dsk.cscec.service.IDProjectService
;
import
com.dsk.cscec.service.IDProjectService
;
import
com.dsk.jsk.domain.EnterpriseInfoHeaderBody
;
import
com.dsk.system.utils.DskOpenApiUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections4.MapUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
*
项目维表(DProject)表服务实现类
*
咨询机构管理
*
*
* @author makejava
* @author makejava
* @since 2023-12-10 15:34:51
* @since 2023-12-10 15:34:51
*/
*/
@Slf4j
@Service
(
"dProjectService"
)
@Service
(
"dProjectService"
)
public
class
IDProjectServiceImpl
extends
ServiceImpl
<
DProjectMapper
,
DProject
>
implements
IDProjectService
{
public
class
IDProjectServiceImpl
extends
ServiceImpl
<
DProjectMapper
,
DProject
>
implements
IDProjectService
{
@Resource
private
DProjectMapper
baseMapper
;
@Resource
private
SysAdvisoryBodyMapper
advisoryBodyMapper
;
@Resource
private
DskOpenApiUtil
dskOpenApiUtil
;
/**
* 获取所有项目列表数据
*
* @param projectSearchBo 查询实体
* @param pageQuery 分页对象
* @return 所有数据
*/
@Override
public
TableDataInfo
<
ProjectSearchVo
>
queryProjectList
(
ProjectSearchBo
projectSearchBo
,
PageQuery
pageQuery
)
{
//根据咨询机构名称查询对应的项目IDs
String
advisoryBodyName
=
projectSearchBo
.
getAdvisoryBodyName
();
List
<
Long
>
projectIds
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotBlank
(
advisoryBodyName
))
{
for
(
SysAdvisoryBody
sysAdvisoryBody
:
advisoryBodyMapper
.
selectList
(
new
LambdaQueryWrapper
<
SysAdvisoryBody
>()
.
like
(
SysAdvisoryBody:
:
getAdvisoryBodyName
,
advisoryBodyName
)))
{
if
(
ObjectUtil
.
isNotNull
(
sysAdvisoryBody
.
getProjectKey
()))
{
projectIds
.
add
(
sysAdvisoryBody
.
getProjectKey
());
}
}
}
Page
<
ProjectSearchVo
>
page
=
baseMapper
.
selectPageProjectList
(
pageQuery
.
build
(),
this
.
buildProjectQueryWrapper
(
projectSearchBo
,
projectIds
));
//补充咨询机构信息
for
(
ProjectSearchVo
projectSearchVo
:
page
.
getRecords
())
{
SysAdvisoryBody
advisoryBody
=
this
.
getAdvisoryBodyByProjectKey
(
projectSearchVo
.
getProjectKey
());
if
(
ObjectUtil
.
isNotNull
(
advisoryBody
))
{
projectSearchVo
.
setAdvisoryBody
(
advisoryBody
);
}
}
return
TableDataInfo
.
build
(
page
);
}
private
Wrapper
<
DProject
>
buildProjectQueryWrapper
(
ProjectSearchBo
projectSearchBo
,
List
<
Long
>
projectIds
)
{
QueryWrapper
<
DProject
>
wrapper
=
Wrappers
.
query
();
//咨询机构的项目数据取中建一局集团第二建筑有限公司和他的下级组织
wrapper
//承包单位ID
.
eq
(
"p.contract_org_id"
,
QueryConstants
.
LEVEL1_COMPANY_ID
)
//承包单位主键(字段叫主键,但并不是主键)
.
eq
(
"p.contract_org_name"
,
QueryConstants
.
LEVEL1_COMPANY_NAME
)
//项目名称
.
like
(
StringUtils
.
isNotBlank
(
projectSearchBo
.
getProjectName
()),
"p.project_name"
,
projectSearchBo
.
getProjectName
())
//根据咨询机构名称查出来对应的项目ID
.
in
(!
projectIds
.
isEmpty
(),
"p.project_id"
,
projectIds
)
//业主单位
.
like
(
StringUtils
.
isNotBlank
(
projectSearchBo
.
getOwnerUnit
()),
"p.owner_name"
,
projectSearchBo
.
getOwnerUnit
())
//项目创建时间(字段去的合同签约日期)
.
between
(
ObjectUtil
.
isNotNull
(
projectSearchBo
.
getProjectStartTime
())
&&
ObjectUtil
.
isNotNull
(
projectSearchBo
.
getProjectEndTime
()),
"p.sign_date"
,
projectSearchBo
.
getProjectStartTime
(),
projectSearchBo
.
getProjectEndTime
())
//项目承接类型下拉选项
.
eq
(
StringUtils
.
isNotBlank
(
projectSearchBo
.
getProjectUndertakeType
()),
"p.isinvestproject"
,
projectSearchBo
.
getProjectUndertakeType
())
//工程基础大类下拉选项
.
eq
(
StringUtils
.
isNotBlank
(
projectSearchBo
.
getEngineeringFoundationCategory
()),
"p.project_type1"
,
projectSearchBo
.
getEngineeringFoundationCategory
())
//工程类别明细
.
eq
(
StringUtils
.
isNotBlank
(
projectSearchBo
.
getEngineeringCategoryDetail
()),
"p.project_type"
,
projectSearchBo
.
getEngineeringCategoryDetail
())
//合同金额
.
between
(
ObjectUtil
.
isNotNull
(
projectSearchBo
.
getMinContractAmount
())
&&
ObjectUtil
.
isNotNull
(
projectSearchBo
.
getMaxContractAmount
()),
"p.contract_orig_value"
,
projectSearchBo
.
getMinContractAmount
(),
projectSearchBo
.
getMaxContractAmount
())
.
orderByDesc
(
"p.load_time"
);
return
wrapper
;
}
/**
* 根据项目ID查询咨询机构
*
* @param projectKey 项目主键
* @return 咨询机构
*/
private
SysAdvisoryBody
getAdvisoryBodyByProjectKey
(
Long
projectKey
)
{
return
advisoryBodyMapper
.
selectOne
(
new
LambdaQueryWrapper
<
SysAdvisoryBody
>()
.
eq
(
SysAdvisoryBody:
:
getProjectKey
,
projectKey
));
}
/**
* 获取所有企业列表(咨询机构)数据
*
* @param advisoryBodySearchBo 查询实体
* @param pageQuery 分页对象
* @return 所有数据
*/
@Override
public
TableDataInfo
<
AdvisoryBodySearchVo
>
queryAdvisoryBodyList
(
AdvisoryBodySearchBo
advisoryBodySearchBo
,
PageQuery
pageQuery
)
{
//先按照分页要求从咨询机构表中查出分页数据
QueryWrapper
<
SysAdvisoryBody
>
wrapper
=
Wrappers
.
query
();
Page
<
AdvisoryBodySearchVo
>
page
=
advisoryBodyMapper
.
selectPageAdvisoryBodyList
(
pageQuery
.
build
(),
wrapper
);
//根据咨询机构cid查询对应的企业信息
for
(
AdvisoryBodySearchVo
advisoryBodySearchVo
:
page
.
getRecords
())
{
EnterpriseInfoHeaderBody
infoHeaderBody
=
new
EnterpriseInfoHeaderBody
();
infoHeaderBody
.
setCompanyId
(
Math
.
toIntExact
(
advisoryBodySearchVo
.
getAdvisoryBodyCid
()));
Map
<
String
,
Object
>
companyMap
=
dskOpenApiUtil
.
requestBody
(
"/api/jsk/enterprise/infoHeader"
,
BeanUtil
.
beanToMap
(
infoHeaderBody
,
false
,
false
));
Map
companyData
=
MapUtils
.
getMap
(
companyMap
,
"data"
,
null
);
//最近一次合作时间
advisoryBodySearchVo
.
setLastCooperateTime
(
advisoryBodyMapper
.
selectLastCooperateTime
(
advisoryBodySearchVo
.
getAdvisoryBodyId
()));
advisoryBodySearchVo
.
setBusinessStatus
(
MapUtils
.
getString
(
companyData
,
"businessStatus"
,
""
));
advisoryBodySearchVo
.
setCorporatePerson
(
MapUtils
.
getString
(
companyData
,
"corporatePerson"
,
""
));
String
provinceName
=
MapUtils
.
getString
(
companyData
,
"provinceName"
,
""
);
String
cityName
=
MapUtils
.
getString
(
companyData
,
"cityName"
,
""
);
String
districtName
=
MapUtils
.
getString
(
companyData
,
"districtName"
,
""
);
advisoryBodySearchVo
.
setRegCapital
(
provinceName
+
cityName
+
districtName
);
advisoryBodySearchVo
.
setRegArea
(
MapUtils
.
getString
(
companyData
,
"regArea"
,
""
));
advisoryBodySearchVo
.
setRegisteredDate
(
MapUtils
.
getString
(
companyData
,
"registeredDate"
,
""
));
advisoryBodySearchVo
.
setBusinessScope
(
MapUtils
.
getString
(
companyData
,
"businessScope"
,
""
));
//合作项目数量
advisoryBodySearchVo
.
setCooperateProjectCount
(
advisoryBodyMapper
.
selectCount
(
new
LambdaQueryWrapper
<
SysAdvisoryBody
>()
.
eq
(
SysAdvisoryBody:
:
getAdvisoryBodyId
,
advisoryBodySearchVo
.
getAdvisoryBodyId
())));
}
return
TableDataInfo
.
build
(
page
);
}
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/SysAdvisoryBodyServiceImpl.java
0 → 100644
View file @
5a8b070c
package
com
.
dsk
.
cscec
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.dsk.cscec.mapper.SysAdvisoryBodyMapper
;
import
com.dsk.cscec.domain.SysAdvisoryBody
;
import
com.dsk.cscec.service.SysAdvisoryBodyService
;
import
org.springframework.stereotype.Service
;
/**
* 咨询机构(SysAdvisoryBody)表服务实现类
*
* @author sxk
* @since 2023-12-12 10:12:09
*/
@Service
(
"sysAdvisoryBodyService"
)
public
class
SysAdvisoryBodyServiceImpl
extends
ServiceImpl
<
SysAdvisoryBodyMapper
,
SysAdvisoryBody
>
implements
SysAdvisoryBodyService
{
}
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectMapper.xml
View file @
5a8b070c
...
@@ -5,5 +5,20 @@
...
@@ -5,5 +5,20 @@
<mapper
namespace=
"com.dsk.cscec.mapper.DProjectMapper"
>
<mapper
namespace=
"com.dsk.cscec.mapper.DProjectMapper"
>
<select
id=
"selectPageProjectList"
resultType=
"com.dsk.cscec.domain.vo.ProjectSearchVo"
>
select p.project_key,
p.project_id,
p.project_name,
p.project_code,
p.province_name,
p.isinvestproject,
p.project_type1,
p.project_type,
p.contract_orig_value,
p.owner_name,
p.contract_org_name,
p.load_time
from d_project p
${ew.getCustomSqlSegment}
</select>
</mapper>
</mapper>
\ No newline at end of file
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/SysAdvisoryBodyMapper.xml
0 → 100644
View file @
5a8b070c
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.dsk.cscec.mapper.SysAdvisoryBodyMapper"
>
<select
id=
"selectLastCooperateTime"
resultType=
"java.util.Date"
>
select ab.create_time
from sys_advisory_body ab
where ab.advisory_body_id = ${advisoryBodyId};
</select>
<select
id=
"selectPageAdvisoryBodyList"
resultType=
"com.dsk.cscec.domain.vo.AdvisoryBodySearchVo"
>
select advisory_body_id,
project_id,
advisory_body_name,
legal_person,
legal_person_phone,
reg_address,
project_leader,
project_leader_major,
project_leader_phone,
settle_star_time,
settle_finish_time,
is_final_judge_unit
from sys_advisory_body ${ew.getCustomSqlSegment}
</select>
</mapper>
\ 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