切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-gateway
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxuhui
3 years ago
提交
99e217131fe42b833d9593145da6bc687740ee3b
1 个父辈
cfb4076d
更新
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
36 行增加
和
19 行删除
pkg/application/web/cooperationContract/dto/dto.go
pkg/application/web/cooperationContract/service/cooperation_contract.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_contract.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_contract_change_log.go
pkg/application/web/cooperationContract/dto/dto.go
查看文件 @
99e2171
...
...
@@ -94,11 +94,11 @@ type ContractUndertaker struct {
Department
domain
.
Department
`json:"department"`
HasReferrer
bool
`json:"hasReferrer"`
HasSalesman
bool
`json:"hasSalesman"`
ReferrerUser
struct
{
ReferrerUser
*
struct
{
UserId
int
`json:"userId,string,"`
UserInfo
domain
.
UserInfo
`json:"userInfo"`
}
`json:"referrerUser"`
SalesmanUser
struct
{
SalesmanUser
*
struct
{
UserId
int
`json:"userId,string,"`
UserInfo
domain
.
UserInfo
`json:"userInfo"`
}
`json:"salesmanUser"`
...
...
@@ -189,14 +189,26 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
UserCode
:
v
.
UserInfo
.
UserCode
,
},
}
u
.
SalesmanUser
.
UserId
=
v
.
Salesman
.
UserId
u
.
SalesmanUser
.
UserInfo
.
UsersId
=
v
.
Salesman
.
UserId
u
.
SalesmanUser
.
UserInfo
.
UsersName
=
v
.
Salesman
.
UserName
u
.
SalesmanUser
.
UserInfo
.
Phone
=
v
.
Salesman
.
UserPhone
u
.
ReferrerUser
.
UserId
=
v
.
Referrer
.
UserId
u
.
ReferrerUser
.
UserInfo
.
UsersId
=
v
.
Referrer
.
UserId
u
.
ReferrerUser
.
UserInfo
.
UsersName
=
v
.
Referrer
.
UserName
u
.
ReferrerUser
.
UserInfo
.
Phone
=
v
.
Referrer
.
UserPhone
if
v
.
Salesman
.
UserId
>
0
{
u
.
SalesmanUser
=
&
struct
{
UserId
int
`json:"userId,string,"`
UserInfo
domain
.
UserInfo
`json:"userInfo"`
}{}
u
.
SalesmanUser
.
UserId
=
v
.
Salesman
.
UserId
u
.
SalesmanUser
.
UserInfo
.
UsersId
=
v
.
Salesman
.
UserId
u
.
SalesmanUser
.
UserInfo
.
UsersName
=
v
.
Salesman
.
UserName
u
.
SalesmanUser
.
UserInfo
.
Phone
=
v
.
Salesman
.
UserPhone
}
if
v
.
Referrer
.
UserId
>
0
{
u
.
ReferrerUser
=
&
struct
{
UserId
int
`json:"userId,string,"`
UserInfo
domain
.
UserInfo
`json:"userInfo"`
}{}
u
.
ReferrerUser
.
UserId
=
v
.
Referrer
.
UserId
u
.
ReferrerUser
.
UserInfo
.
UsersId
=
v
.
Referrer
.
UserId
u
.
ReferrerUser
.
UserInfo
.
UsersName
=
v
.
Referrer
.
UserName
u
.
ReferrerUser
.
UserInfo
.
Phone
=
v
.
Referrer
.
UserPhone
}
contractUndertaker
=
append
(
contractUndertaker
,
u
)
}
undertakerTypesUncheckedAvailable
:=
param
.
UndertakerTypesUncheckedAvailable
...
...
pkg/application/web/cooperationContract/service/cooperation_contract.go
查看文件 @
99e2171
...
...
@@ -118,6 +118,7 @@ func (cooperationContractService *CooperationContractService) ListCooperationCon
PageSize
:
listCooperationContractQuery
.
PageSize
,
SponsorName
:
listCooperationContractQuery
.
SponsorName
,
CooperationContractNumber
:
listCooperationContractQuery
.
CooperationContractNumber
,
OrgIds
:
listCooperationContractQuery
.
Operator
.
OrgIds
,
})
if
err
!=
nil
{
return
0
,
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
...
...
@@ -214,6 +215,7 @@ func (cooperationContractService *CooperationContractService) SearchCooperationC
PageNumber
:
queryParam
.
PageNumber
,
PageIndex
:
queryParam
.
PageSize
,
CompanyId
:
queryParam
.
Operator
.
CompanyId
,
OrgIds
:
queryParam
.
Operator
.
OrgIds
,
})
return
result
.
Grid
.
Total
,
result
.
Grid
.
List
,
err
...
...
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_contract.go
查看文件 @
99e2171
...
...
@@ -235,6 +235,8 @@ type (
OrgId
int64
` json:"orgId"`
// 用户基础数据id
UserBaseId
int64
`json:"userBaseId"`
// 组织机构ID
OrgIds
[]
int64
` json:"orgIds"`
}
DataCooperationContractSearch
struct
{
...
...
@@ -248,13 +250,14 @@ type (
//根据承接人查询并返回共创项目合约
type
(
ReqCooperationContractSearchByUndertaker
struct
{
CooperationContractName
string
`json:"cooperationContractName"`
//合约名称
SponsorName
string
`json:"sponsorName"`
//项目发起人姓名
PageNumber
int
`json:"pageNumber"`
PageIndex
int
`json:"pageIndex"`
CompanyId
int64
` json:"companyId"`
OrgId
int64
` json:"orgId"`
UserBaseId
int64
`json:"userBaseId"`
CooperationContractName
string
`json:"cooperationContractName"`
//合约名称
SponsorName
string
`json:"sponsorName"`
//项目发起人姓名
PageNumber
int
`json:"pageNumber"`
PageIndex
int
`json:"pageIndex"`
CompanyId
int64
` json:"companyId"`
OrgId
int64
` json:"orgId"`
UserBaseId
int64
`json:"userBaseId"`
OrgIds
[]
int64
` json:"orgIds"`
}
DataCooperationContractSearchByUndertaker
struct
{
...
...
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_contract_change_log.go
查看文件 @
99e2171
...
...
@@ -7,12 +7,12 @@ type (
ReqContractChangeLogsSearch
struct
{
OperationType
int
`json:"operationType,"`
// 合约变更操作类型,1编辑、2暂停、3恢复
CooperationContractNumber
string
`json:"cooperationContractNumber"`
// 共创合约编号
PageNumber
int
`
json:"pageNumber,"`
// 页码
PageNumber
int
`
json:"pageNumber,"`
// 页码
PageSize
int
`json:"pageSize,"`
// 页面大小
CompanyId
int
`json:"companyId"`
//公司ID
OrgId
int64
`json:"orgId"`
// 组织机构ID
OrgIds
[]
int64
`json:"orgIds"`
// 关联的组织机构ID列表
UserId
int64
`
json:"userId"`
// 用户ID,
UserId
int64
`
json:"userId"`
// 用户ID,
UserBaseId
int64
`json:"userBaseId"`
// 用户基础数据id
}
...
...
请
注册
或
登录
后发表评论