allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 edd56569b86e4877ef2df599a108ac77f0a93425 1 个父辈 6f6f10ab

feat:账期结算单增加参与类型字段

内嵌 并排对比
正在显示 8 个修改的文件 包含 16 行增加 和 3 行删除
不能预览此文件类型
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="CodeStream">
  4 + <option name="webViewContext" value="{&quot;chatProviderAccess&quot;:&quot;strict&quot;,&quot;currentTeamId&quot;:&quot;&quot;,&quot;currentStreamId&quot;:&quot;&quot;,&quot;pullRequestCheckoutBranch&quot;:false,&quot;isRepositioning&quot;:false,&quot;onboardStep&quot;:0,&quot;panelStack&quot;:[&quot;landing-redirect&quot;],&quot;hasFocus&quot;:false,&quot;channelFilter&quot;:&quot;all&quot;,&quot;channelsMuteAll&quot;:false,&quot;codemarkFileFilter&quot;:&quot;all&quot;,&quot;codemarkTypeFilter&quot;:&quot;all&quot;,&quot;codemarkTagFilter&quot;:&quot;all&quot;,&quot;codemarkBranchFilter&quot;:&quot;all&quot;,&quot;codemarkAuthorFilter&quot;:&quot;all&quot;,&quot;codemarksFileViewStyle&quot;:&quot;inline&quot;,&quot;codemarksShowArchived&quot;:false,&quot;codemarksShowResolved&quot;:false,&quot;codemarksWrapComments&quot;:false,&quot;showFeedbackSmiley&quot;:true,&quot;route&quot;:{&quot;name&quot;:&quot;newUserEntry&quot;,&quot;params&quot;:{}},&quot;spatialViewShowPRComments&quot;:false}" />
  5 + </component>
  6 +</project>
@@ -4,7 +4,6 @@ go 1.16 @@ -4,7 +4,6 @@ go 1.16
4 4
5 require ( 5 require (
6 github.com/Shopify/sarama v1.25.0 6 github.com/Shopify/sarama v1.25.0
7 - github.com/Tnze/go.num/v2 v2.0.0-20191006170829-cb483d4c9152 // indirect  
8 github.com/ajg/form v1.5.1 // indirect 7 github.com/ajg/form v1.5.1 // indirect
9 github.com/beego/beego/v2 v2.0.1 8 github.com/beego/beego/v2 v2.0.1
10 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect 9 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect
@@ -5,8 +5,6 @@ github.com/Shopify/sarama v1.25.0 h1:ch1ywjRLjfJtU+EaiJ+l0rWffQ6TRpyYmW4DX7Cb2SU @@ -5,8 +5,6 @@ github.com/Shopify/sarama v1.25.0 h1:ch1ywjRLjfJtU+EaiJ+l0rWffQ6TRpyYmW4DX7Cb2SU
5 github.com/Shopify/sarama v1.25.0/go.mod h1:y/CFFTO9eaMTNriwu/Q+W4eioLqiDMGkA1W+gmdfj8w= 5 github.com/Shopify/sarama v1.25.0/go.mod h1:y/CFFTO9eaMTNriwu/Q+W4eioLqiDMGkA1W+gmdfj8w=
6 github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= 6 github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
7 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= 7 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
8 -github.com/Tnze/go.num/v2 v2.0.0-20191006170829-cb483d4c9152 h1:6Ny2zcG2k/0aOE8rLbDdLdPMr0o7lqMfdnYJe6pZj9w=  
9 -github.com/Tnze/go.num/v2 v2.0.0-20191006170829-cb483d4c9152/go.mod h1:fNGLFjpxgDvBqQPv1HYSuGi6pRuI8wdKvvspYvUQufc=  
10 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= 8 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
11 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= 9 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
12 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= 10 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -22,6 +22,8 @@ type CreditAccount struct { @@ -22,6 +22,8 @@ type CreditAccount struct {
22 CooperationContractNumber string `json:"cooperationContractNumber"` 22 CooperationContractNumber string `json:"cooperationContractNumber"`
23 // 参与人uid，包括承接人、推荐人、关联业务员 23 // 参与人uid，包括承接人、推荐人、关联业务员
24 Participator *Participator `json:"participator"` 24 Participator *Participator `json:"participator"`
  25 + // 参与类型
  26 + ParticipateType string `json:"participateType"`
25 // 支付凭证附件 27 // 支付凭证附件
26 PaymentDocumentAttachment *Attachment `json:"paymentDocumentAttachment"` 28 PaymentDocumentAttachment *Attachment `json:"paymentDocumentAttachment"`
27 // 数据所属组织机构 29 // 数据所属组织机构
@@ -25,6 +25,8 @@ type CreditAccount struct { @@ -25,6 +25,8 @@ type CreditAccount struct {
25 CooperationContractNumber string `comment:"共创合约编号"` 25 CooperationContractNumber string `comment:"共创合约编号"`
26 // 参与人uid，包括承接人、推荐人、关联业务员 26 // 参与人uid，包括承接人、推荐人、关联业务员
27 Participator *domain.Participator `comment:"参与人uid，包括承接人、推荐人、关联业务员" pg:",array"` 27 Participator *domain.Participator `comment:"参与人uid，包括承接人、推荐人、关联业务员" pg:",array"`
  28 + // 参与类型
  29 + ParticipateType string `comment:"参与类型，承接人，推荐人，业务员"`
28 // 支付凭证附件 30 // 支付凭证附件
29 PaymentDocumentAttachment *domain.Attachment `comment:"支付凭证附件"` 31 PaymentDocumentAttachment *domain.Attachment `comment:"支付凭证附件"`
30 // 数据所属组织机构 32 // 数据所属组织机构
@@ -16,6 +16,7 @@ func TransformToCreditAccountDomainModelFromPgModels(creditAccountModel *models. @@ -16,6 +16,7 @@ func TransformToCreditAccountDomainModelFromPgModels(creditAccountModel *models.
16 SettlementTime: creditAccountModel.SettlementTime, 16 SettlementTime: creditAccountModel.SettlementTime,
17 CooperationContractNumber: creditAccountModel.CooperationContractNumber, 17 CooperationContractNumber: creditAccountModel.CooperationContractNumber,
18 Participator: creditAccountModel.Participator, 18 Participator: creditAccountModel.Participator,
  19 + ParticipateType: creditAccountModel.ParticipateType,
19 PaymentDocumentAttachment: creditAccountModel.PaymentDocumentAttachment, 20 PaymentDocumentAttachment: creditAccountModel.PaymentDocumentAttachment,
20 Org: creditAccountModel.Org, 21 Org: creditAccountModel.Org,
21 Company: creditAccountModel.Company, 22 Company: creditAccountModel.Company,
@@ -35,6 +35,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -35,6 +35,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
35 "settlement_time", 35 "settlement_time",
36 "cooperation_contract_number", 36 "cooperation_contract_number",
37 "participator", 37 "participator",
  38 + "participate_type",
38 "payment_document_attachment", 39 "payment_document_attachment",
39 "org", 40 "org",
40 "company", 41 "company",
@@ -68,6 +69,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -68,6 +69,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
68 &creditAccount.SettlementTime, 69 &creditAccount.SettlementTime,
69 &creditAccount.CooperationContractNumber, 70 &creditAccount.CooperationContractNumber,
70 &creditAccount.Participator, 71 &creditAccount.Participator,
  72 + &creditAccount.ParticipateType,
71 &creditAccount.PaymentDocumentAttachment, 73 &creditAccount.PaymentDocumentAttachment,
72 &creditAccount.Org, 74 &creditAccount.Org,
73 &creditAccount.Company, 75 &creditAccount.Company,
@@ -87,6 +89,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -87,6 +89,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
87 creditAccount.SettlementTime, 89 creditAccount.SettlementTime,
88 creditAccount.CooperationContractNumber, 90 creditAccount.CooperationContractNumber,
89 creditAccount.Participator, 91 creditAccount.Participator,
  92 + creditAccount.ParticipateType,
90 creditAccount.PaymentDocumentAttachment, 93 creditAccount.PaymentDocumentAttachment,
91 creditAccount.Org, 94 creditAccount.Org,
92 creditAccount.Company, 95 creditAccount.Company,
@@ -110,6 +113,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -110,6 +113,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
110 &creditAccount.SettlementTime, 113 &creditAccount.SettlementTime,
111 &creditAccount.CooperationContractNumber, 114 &creditAccount.CooperationContractNumber,
112 &creditAccount.Participator, 115 &creditAccount.Participator,
  116 + &creditAccount.ParticipateType,
113 &creditAccount.PaymentDocumentAttachment, 117 &creditAccount.PaymentDocumentAttachment,
114 &creditAccount.Org, 118 &creditAccount.Org,
115 &creditAccount.Company, 119 &creditAccount.Company,
@@ -129,6 +133,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -129,6 +133,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
129 creditAccount.SettlementTime, 133 creditAccount.SettlementTime,
130 creditAccount.CooperationContractNumber, 134 creditAccount.CooperationContractNumber,
131 creditAccount.Participator, 135 creditAccount.Participator,
  136 + creditAccount.ParticipateType,
132 creditAccount.PaymentDocumentAttachment, 137 creditAccount.PaymentDocumentAttachment,
133 creditAccount.Org, 138 creditAccount.Org,
134 creditAccount.Company, 139 creditAccount.Company,