切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-cooperation
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
yangfu
3 years ago
提交
7b854a477aeafaa027e401014a68d5bda5b45fb5
1 个父辈
98ac488a
dev
...
master
test
支付凭证重复修改
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
12 行增加
和
1 行删除
pkg/domain/cooperation_person_statistics_dto.go
pkg/infrastructure/domain_service/pg_cooperation_person_statistics_service.go
pkg/domain/cooperation_person_statistics_dto.go
查看文件 @
7b854a4
...
...
@@ -55,6 +55,8 @@ type ContractParticipant struct {
SensitiveFlag
bool
`json:"sensitiveFlag"`
// 共创合约编号
primaryKey
string
`json:"key"`
// 支付凭证去重
duplicatePaymentDocuments
map
[
string
]
struct
{}
}
func
(
u
*
User
)
SimpleCopy
()
map
[
string
]
interface
{}
{
...
...
@@ -82,12 +84,21 @@ func NewContractParticipant(u *User, primaryKey string, attachments []*Attachmen
Participant
:
u
.
SimpleCopy
(),
primaryKey
:
primaryKey
,
PaymentDocuments
:
make
([]
*
Attachment
,
0
),
duplicatePaymentDocuments
:
make
(
map
[
string
]
struct
{}),
}
if
len
(
attachments
)
>
0
{
p
.
ContractContent
=
attachments
[
0
]
.
Name
}
return
p
}
func
(
cp
*
ContractParticipant
)
AppendAttachments
(
attachments
[]
*
Attachment
)
{
for
i
:=
range
attachments
{
if
_
,
ok
:=
cp
.
duplicatePaymentDocuments
[
attachments
[
i
]
.
Url
];
!
ok
{
cp
.
duplicatePaymentDocuments
[
attachments
[
i
]
.
Url
]
=
struct
{}{}
cp
.
PaymentDocuments
=
append
(
cp
.
PaymentDocuments
,
attachments
[
i
])
}
}
}
func
(
cp
*
ContractParticipant
)
Complete
(
userBaseId
int64
,
sensitive
bool
)
*
ContractParticipant
{
cp
.
SensitiveFlag
=
false
...
...
pkg/infrastructure/domain_service/pg_cooperation_person_statistics_service.go
查看文件 @
7b854a4
...
...
@@ -320,7 +320,7 @@ func (ptr *CooperationStatisticsService) PersonCooperationProjectSharedInfo(quer
if
len
(
v
.
PaymentDocument
)
==
0
&&
len
(
mapCreditAccount
[
key
]
.
PaymentDocumentAttachments
)
>
0
{
v
.
PaymentDocument
=
"查看"
}
v
.
PaymentDocuments
=
append
(
v
.
PaymentDocuments
,
creditAccounts
[
i
]
.
PaymentDocumentAttachments
...
)
v
.
AppendAttachments
(
creditAccounts
[
i
]
.
PaymentDocumentAttachments
)
}
}
}
...
...
请
注册
或
登录
后发表评论