Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
cfld-know-partner
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-know-partner
Commits
bb6491f3
Commit
bb6491f3
authored
Oct 31, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合伙招商api
parent
c40e97d1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
123 additions
and
6 deletions
+123
-6
PartnerAllocationProjectInfoVO.java
.../com/partner/admin/VO/PartnerAllocationProjectInfoVO.java
+1
-1
PartnerExamineProjectInfoVO.java
...ava/com/partner/admin/VO/PartnerExamineProjectInfoVO.java
+1
-1
PartnerProjectStatusChangeLogVO.java
...com/partner/admin/VO/PartnerProjectStatusChangeLogVO.java
+89
-0
PartnerPushProjectInfoVO.java
...n/java/com/partner/admin/VO/PartnerPushProjectInfoVO.java
+1
-1
PartnerProjectInfoServiceImpl.java
...ner/admin/service/impl/PartnerProjectInfoServiceImpl.java
+31
-3
No files found.
src/main/java/com/partner/admin/VO/PartnerAllocationProjectInfoVO.java
View file @
bb6491f3
...
...
@@ -20,7 +20,7 @@ public class PartnerAllocationProjectInfoVO implements Serializable {
private
PartnerAllocationDetailVO
partnerProjectDetail
=
new
PartnerAllocationDetailVO
();
@ApiModelProperty
(
value
=
"审核节点"
)
private
List
<
PartnerProjectStatusChangeLog
>
partnerProjectStatusChangeLogs
=
new
ArrayList
<>();
private
List
<
PartnerProjectStatusChangeLog
VO
>
partnerProjectStatusChangeLogs
=
new
ArrayList
<>();
@ApiModelProperty
(
value
=
"合伙人信息"
)
private
PartnerSecretaryVO
partnerSecretary
=
new
PartnerSecretaryVO
();
...
...
src/main/java/com/partner/admin/VO/PartnerExamineProjectInfoVO.java
View file @
bb6491f3
...
...
@@ -20,7 +20,7 @@ public class PartnerExamineProjectInfoVO implements Serializable {
private
PartnerExamineDetailVO
partnerProjectDetail
=
new
PartnerExamineDetailVO
();
@ApiModelProperty
(
value
=
"审核节点"
)
private
List
<
PartnerProjectStatusChangeLog
>
partnerProjectStatusChangeLogs
=
new
ArrayList
<>();
private
List
<
PartnerProjectStatusChangeLog
VO
>
partnerProjectStatusChangeLogs
=
new
ArrayList
<>();
@ApiModelProperty
(
value
=
"合伙人信息"
)
private
PartnerSecretaryVO
partnerSecretary
=
new
PartnerSecretaryVO
();
...
...
src/main/java/com/partner/admin/VO/PartnerProjectStatusChangeLogVO.java
0 → 100644
View file @
bb6491f3
package
com
.
partner
.
admin
.
VO
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
*
* @TableName partner_project_status_change_log
*/
@Data
@ApiModel
(
value
=
"审核节点"
)
public
class
PartnerProjectStatusChangeLogVO
implements
Serializable
{
/**
*
*/
@ApiModelProperty
(
value
=
"id"
)
private
Integer
id
;
/**
*
*/
private
String
updateTime
=
""
;
/**
* 项目状态code
*/
@ApiModelProperty
(
value
=
"项目状态code"
)
private
Integer
projectStatus
;
/**
* 项目状态
*/
@ApiModelProperty
(
value
=
"项目状态"
)
private
String
projectStatusDisplay
;
/**
*
*/
@ApiModelProperty
(
value
=
"所属项目id"
)
private
Integer
projectId
;
/**
* 操作人
*/
@ApiModelProperty
(
value
=
"操作人"
)
private
Integer
operaterId
=
0
;
/**
*
*/
@ApiModelProperty
(
value
=
""
)
private
Integer
tenantId
=
0
;
/**
* 描述
*/
@ApiModelProperty
(
value
=
"描述"
)
private
String
description
=
""
;
/**
* 0-项目查重确认 1-确认项目所属 2-确认佣金比例
*/
@ApiModelProperty
(
value
=
"0-项目查重确认 1-项目信息确认 2-确认佣金比例"
)
private
Integer
todoStatus
=
-
1
;
/**
* 0-项目查重确认 1-确认项目所属 2-确认佣金比例
*/
@ApiModelProperty
(
value
=
"0-项目查重确认 1-项目信息确认 2-确认佣金比例"
)
private
String
todoStatusDescription
=
""
;
/**
* 0-项目查重确认 1-确认项目所属 2-确认佣金比例
*/
@ApiModelProperty
(
value
=
"当前节点状态(0-未进行;1-进行中;2-已完成)"
)
private
Integer
currentNodeStatus
=
0
;
@TableField
(
exist
=
false
)
private
static
final
long
serialVersionUID
=
1L
;
}
\ No newline at end of file
src/main/java/com/partner/admin/VO/PartnerPushProjectInfoVO.java
View file @
bb6491f3
...
...
@@ -20,7 +20,7 @@ public class PartnerPushProjectInfoVO implements Serializable {
private
PartnerPushDetailVO
partnerProjectDetail
=
new
PartnerPushDetailVO
();
@ApiModelProperty
(
value
=
"审核节点"
)
private
List
<
PartnerProjectStatusChangeLog
>
partnerProjectStatusChangeLogs
=
new
ArrayList
<>();
private
List
<
PartnerProjectStatusChangeLog
VO
>
partnerProjectStatusChangeLogs
=
new
ArrayList
<>();
@ApiModelProperty
(
value
=
"合伙人信息"
)
private
PartnerSecretaryVO
partnerSecretary
=
new
PartnerSecretaryVO
();
...
...
src/main/java/com/partner/admin/service/impl/PartnerProjectInfoServiceImpl.java
View file @
bb6491f3
...
...
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.partner.admin.VO.*
;
import
com.partner.admin.common.utils.DateUtils
;
import
com.partner.admin.domain.*
;
import
com.partner.admin.enumerate.*
;
import
com.partner.admin.mapper.*
;
...
...
@@ -223,7 +224,16 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
}
ppsclQW
.
in
(
"project_status"
,
list
);
List
<
PartnerProjectStatusChangeLog
>
partnerProjectStatusChangeLogs
=
changeLogMapper
.
selectList
(
ppsclQW
);
partnerExamineProjectInfoVO
.
setPartnerProjectStatusChangeLogs
(
partnerProjectStatusChangeLogs
);
List
<
PartnerProjectStatusChangeLogVO
>
collect
=
partnerProjectStatusChangeLogs
.
stream
().
map
(
e
->
{
PartnerProjectStatusChangeLogVO
vo
=
new
PartnerProjectStatusChangeLogVO
();
BeanUtils
.
copyProperties
(
e
,
vo
);
vo
.
setUpdateTime
(
DateUtils
.
parseDateToStr
(
"yyyy-MM-dd HH:mm:ss"
,
e
.
getUpdateTime
()));
if
(
e
.
getCurrentNodeStatus
()
!=
2
)
{
vo
.
setUpdateTime
(
""
);
}
return
vo
;
}).
collect
(
Collectors
.
toList
());
partnerExamineProjectInfoVO
.
setPartnerProjectStatusChangeLogs
(
collect
);
//获取合伙人信息
QueryWrapper
<
PartnerSecretaryBind
>
psbQW
=
new
QueryWrapper
<>();
...
...
@@ -267,7 +277,16 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
}
ppsclQW
.
in
(
"project_status"
,
list
);
List
<
PartnerProjectStatusChangeLog
>
partnerProjectStatusChangeLogs
=
changeLogMapper
.
selectList
(
ppsclQW
);
partnerPushProjectInfoVO
.
setPartnerProjectStatusChangeLogs
(
partnerProjectStatusChangeLogs
);
List
<
PartnerProjectStatusChangeLogVO
>
collect
=
partnerProjectStatusChangeLogs
.
stream
().
map
(
e
->
{
PartnerProjectStatusChangeLogVO
vo
=
new
PartnerProjectStatusChangeLogVO
();
BeanUtils
.
copyProperties
(
e
,
vo
);
vo
.
setUpdateTime
(
DateUtils
.
parseDateToStr
(
"yyyy-MM-dd HH:mm:ss"
,
e
.
getUpdateTime
()));
if
(
e
.
getCurrentNodeStatus
()
!=
2
)
{
vo
.
setUpdateTime
(
""
);
}
return
vo
;
}).
collect
(
Collectors
.
toList
());
partnerPushProjectInfoVO
.
setPartnerProjectStatusChangeLogs
(
collect
);
//获取合伙人信息
PartnerProjectInfo
partnerProjectInfo
=
partnerProjectInfoMapper
.
selectById
(
id
);
...
...
@@ -307,7 +326,16 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
}
ppsclQW
.
in
(
"project_status"
,
list
);
List
<
PartnerProjectStatusChangeLog
>
partnerProjectStatusChangeLogs
=
changeLogMapper
.
selectList
(
ppsclQW
);
partnerAllocationProjectInfoVO
.
setPartnerProjectStatusChangeLogs
(
partnerProjectStatusChangeLogs
);
List
<
PartnerProjectStatusChangeLogVO
>
collect
=
partnerProjectStatusChangeLogs
.
stream
().
map
(
e
->
{
PartnerProjectStatusChangeLogVO
vo
=
new
PartnerProjectStatusChangeLogVO
();
BeanUtils
.
copyProperties
(
e
,
vo
);
vo
.
setUpdateTime
(
DateUtils
.
parseDateToStr
(
"yyyy-MM-dd HH:mm:ss"
,
e
.
getUpdateTime
()));
if
(
e
.
getCurrentNodeStatus
()
!=
2
)
{
vo
.
setUpdateTime
(
""
);
}
return
vo
;
}).
collect
(
Collectors
.
toList
());
partnerAllocationProjectInfoVO
.
setPartnerProjectStatusChangeLogs
(
collect
);
//获取合伙人信息
PartnerProjectInfo
partnerProjectInfo
=
partnerProjectInfoMapper
.
selectById
(
id
);
...
...
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