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
07c09cfa
Commit
07c09cfa
authored
Dec 19, 2023
by
dengguangman
Committed by
Administrator
Dec 19, 2023
Browse files
Options
Browse Files
Download
Plain Diff
咨询业务往来
Signed-off-by:
Administrator
<
admin@example.com
>
parents
514d85e1
7669331e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
178 additions
and
6 deletions
+178
-6
DSubcontractMapper.java
...rc/main/java/com/dsk/cscec/mapper/DSubcontractMapper.java
+4
-1
DCustomerServiceImpl.java
...java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java
+6
-4
CompanyRelationTableV1Controller.java
.../dsk/jsk/controller/CompanyRelationTableV1Controller.java
+51
-0
JskCompanyRelationTableV1Dto.java
...java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java
+71
-0
CompanyRelationTableV1Service.java
...va/com/dsk/jsk/service/CompanyRelationTableV1Service.java
+35
-0
DSubcontractMapper.xml
...pi/src/main/resources/mapper/cscec/DSubcontractMapper.xml
+11
-1
No files found.
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DSubcontractMapper.java
View file @
07c09cfa
...
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.dsk.cscec.domain.DSubcontract
;
import
com.dsk.cscec.domain.vo.DCustomerListVo
;
import
com.dsk.cscec.domain.bo.CustomerCooperationBo
;
import
com.dsk.cscec.domain.vo.CustomerCooperationVo
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -21,7 +22,9 @@ public interface DSubcontractMapper extends BaseMapper<DSubcontract> {
Integer
selectProjectCountByCustomerId
(
String
customerId
);
/**
DCustomerListVo
selectStatisticByCustomerId
(
String
customerId
);
/**
* 供应商合作记录
* @param build
* @param bo
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java
View file @
07c09cfa
...
...
@@ -45,10 +45,11 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
Page
<
DCustomerListVo
>
page
=
baseMapper
.
allSearchList
(
query
.
build
(),
bo
);
if
(
CollectionUtils
.
isNotEmpty
(
page
.
getRecords
()))
{
page
.
getRecords
().
parallelStream
().
forEach
(
item
->{
DCustomerListVo
vo
=
subcontractMapper
.
selectStatisticByCustomerId
(
item
.
getCustomerId
());
//企业合作数量
item
.
setEnterpriseCooperationCount
(
subcontractMapper
.
selectEnterpriseCountByCustomerId
(
item
.
getCustomerId
()
));
item
.
setEnterpriseCooperationCount
(
vo
.
getEnterpriseCooperationCount
(
));
//项目合作数量
item
.
setProjectCooperationCount
(
subcontractMapper
.
selectProjectCountByCustomerId
(
item
.
getCustomerId
()
));
item
.
setProjectCooperationCount
(
vo
.
getProjectCooperationCount
(
));
try
{
Map
<
String
,
Object
>
map
=
opportunityRadarService
.
enterpriseByName
(
item
.
getCustomerName
());
if
(!
ObjectUtils
.
isEmpty
(
map
.
get
(
"data"
)))
{
...
...
@@ -71,10 +72,11 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
List
<
DCustomerListVo
>
records
=
baseMapper
.
allSearchList
(
query
.
build
(),
bo
).
getRecords
();
if
(
CollectionUtils
.
isNotEmpty
(
records
)){
records
.
parallelStream
().
forEach
(
item
->{
DCustomerListVo
vo
=
subcontractMapper
.
selectStatisticByCustomerId
(
item
.
getCustomerId
());
//企业合作数量
item
.
setEnterpriseCooperationCount
(
subcontractMapper
.
selectEnterpriseCountByCustomerId
(
item
.
getCustomerId
()
));
item
.
setEnterpriseCooperationCount
(
vo
.
getEnterpriseCooperationCount
(
));
//项目合作数量
item
.
setProjectCooperationCount
(
subcontractMapper
.
selectProjectCountByCustomerId
(
item
.
getCustomerId
()
));
item
.
setProjectCooperationCount
(
vo
.
getProjectCooperationCount
(
));
});
}
return
records
;
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/CompanyRelationTableV1Controller.java
0 → 100644
View file @
07c09cfa
package
com
.
dsk
.
jsk
.
controller
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.jsk.domain.JskCompanyRelationTableV1Dto
;
import
com.dsk.jsk.service.CompanyRelationTableV1Service
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.annotation.Resource
;
/**
* @ClassName CompanyRelationTableV1Controller
* @Description
* @Author Dgm
* @Date 2023/12/13 11:28
* @Version
*/
@RestController
@RequestMapping
(
"/consultancy"
)
public
class
CompanyRelationTableV1Controller
{
@Resource
private
CompanyRelationTableV1Service
relationTableV1Service
;
/***
*@Description: 业主/施工/集团单位-分页列表
*@Param:
*@return: com.dsk.common.core.domain.AjaxResult
*@Author: Dgm
*@date: 2023/5/18 10:29
*/
@PostMapping
(
"/page"
)
public
TableDataInfo
page
(
@RequestBody
JskCompanyRelationTableV1Dto
dto
)
throws
Exception
{
return
relationTableV1Service
.
page
(
dto
);
}
/***
*@Description: -业主/施工/集团单位详情-分页列表
*@Param:
*@return: com.dsk.common.core.domain.AjaxResult
*@Author: Dgm
*@date: 2023/5/18 10:29
*/
@PostMapping
(
"/detailPage"
)
public
TableDataInfo
detailPage
(
@RequestBody
JskCompanyRelationTableV1Dto
dto
)
throws
Exception
{
return
relationTableV1Service
.
detailPage
(
dto
);
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java
0 → 100644
View file @
07c09cfa
package
com
.
dsk
.
jsk
.
domain
;
import
lombok.Data
;
import
java.util.List
;
/**
* @ClassName JskCompanyRelationTableV1Dto
* @Description
* @Author Dgm
* @Date 2023/12/11 20:37
* @Version
*/
@Data
public
class
JskCompanyRelationTableV1Dto
extends
BasePage
{
/**
* 搜-关键字素
*/
private
String
keyword
;
/**
* 企业类型
*/
private
String
companyRole
;
/**
* 项目类型
*/
private
List
<
String
>
counterpartCompanyRoles
;
/**
* 工程类型
*/
private
List
<
String
>
projectTypes
;
/**
* 咨询机构业务类型
*/
private
List
<
String
>
businessTypes
;
/**
* 公布日期-开始时间
*/
private
String
beginTime
;
/**
* 公布日期-结束时间
*/
private
String
endTime
;
/**
* 本次合作合同金额(万元)-最大金额
*/
private
Double
maxAmount
;
/**
* 本次合作合同金额(万元)-最小金额
*/
private
Double
minAmount
;
/**
* 企业Id
*/
private
Integer
companyId
;
/**
* 企业类型 1:业主 2:施工 3:集团
*/
private
Integer
companyType
;
/**
* 排序 1:金额降序 2:金额升序 3: 时间降序 4: 时间升区5: 数量降序6:数量升序
*/
private
Integer
sort
=
5
;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/CompanyRelationTableV1Service.java
0 → 100644
View file @
07c09cfa
package
com
.
dsk
.
jsk
.
service
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.jsk.domain.*
;
import
com.dsk.system.utils.DskOpenApiUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.Map
;
/**
* @ClassName CompanyRelationTableV1Controller
* @Description
* @Author Dgm
* @Date 2023/12/13 11:28
* @Version
*/
@Slf4j
@Service
public
class
CompanyRelationTableV1Service
{
@Autowired
private
DskOpenApiUtil
dskOpenApiUtil
;
public
TableDataInfo
page
(
JskCompanyRelationTableV1Dto
dto
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/consultancy/page"
,
BeanUtil
.
beanToMap
(
dto
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
public
TableDataInfo
detailPage
(
JskCompanyRelationTableV1Dto
dto
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
dskOpenApiUtil
.
requestBody
(
"/operate/consultancy/detailPage"
,
BeanUtil
.
beanToMap
(
dto
,
false
,
false
));
return
dskOpenApiUtil
.
responsePage
(
map
);
}
}
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DSubcontractMapper.xml
View file @
07c09cfa
...
...
@@ -17,7 +17,17 @@
) a
</select>
<select
id=
"selectCooperationList"
resultType=
"com.dsk.cscec.domain.vo.CustomerCooperationVo"
>
<select
id=
"selectStatisticByCustomerId"
resultType=
"com.dsk.cscec.domain.vo.DCustomerListVo"
>
select
count(DISTINCT org.customer_id) enterpriseCooperationCount,
count(DISTINCT project.customer_id) projectCooperationCount
from d_customer dc
left join d_subcontract org on org.customer_id = dc.customer_id
left join d_subcontract project on project.customer_id = dc.customer_id
where dc.customer_id = #{customerId}
</select>
<select
id=
"selectCooperationList"
resultType=
"com.dsk.cscec.domain.vo.CustomerCooperationVo"
>
select ds.subcontract_key,ds.subcontract_id,ds.project_name,ds.sign_org_name,ds.sign_date,ds.subcontract_value,ds.settle_value,ds.job_scope,
dp.area_name,dp.province_name,dp.city_name,dp.project_manager_name,dp.project_manager_phone,dp.project_type2
from d_subcontract ds
...
...
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