正在显示
5 个修改的文件
包含
7 行增加
和
6 行删除
@@ -2,6 +2,7 @@ package command | @@ -2,6 +2,7 @@ package command | ||
2 | 2 | ||
3 | import ( | 3 | import ( |
4 | "fmt" | 4 | "fmt" |
5 | + | ||
5 | "github.com/beego/beego/v2/core/validation" | 6 | "github.com/beego/beego/v2/core/validation" |
6 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" | 7 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" |
7 | ) | 8 | ) |
@@ -15,7 +16,7 @@ type CreditAccountPayCommand struct { | @@ -15,7 +16,7 @@ type CreditAccountPayCommand struct { | ||
15 | ActuallyPaidAmount float64 `cname:"账期结算实付金额" json:"actuallyPaidAmount" valid:"Required"` | 16 | ActuallyPaidAmount float64 `cname:"账期结算实付金额" json:"actuallyPaidAmount" valid:"Required"` |
16 | // 备注 | 17 | // 备注 |
17 | Remarks string `cname:"备注" json:"remark"` | 18 | Remarks string `cname:"备注" json:"remark"` |
18 | - Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件 | 19 | + Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件 |
19 | } | 20 | } |
20 | 21 | ||
21 | func (cmd *CreditAccountPayCommand) Valid(validation *validation.Validation) { | 22 | func (cmd *CreditAccountPayCommand) Valid(validation *validation.Validation) { |
@@ -189,7 +189,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC | @@ -189,7 +189,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC | ||
189 | Undertakers: underTakers, | 189 | Undertakers: underTakers, |
190 | RelevantIds: updateCooperationContractCommand.RelationUser, | 190 | RelevantIds: updateCooperationContractCommand.RelationUser, |
191 | CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription, | 191 | CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription, |
192 | - CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber, | 192 | + // CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber, |
193 | CooperationProjectNumber: updateCooperationContractCommand.CooperationContract.CooperationProjectNumber, | 193 | CooperationProjectNumber: updateCooperationContractCommand.CooperationContract.CooperationProjectNumber, |
194 | DepartmentId: updateCooperationContractCommand.CooperationContract.DepartmentId, | 194 | DepartmentId: updateCooperationContractCommand.CooperationContract.DepartmentId, |
195 | CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType, | 195 | CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType, |
@@ -7,5 +7,5 @@ type PayCreditAccountCommand struct { | @@ -7,5 +7,5 @@ type PayCreditAccountCommand struct { | ||
7 | CreditAccountId int `json:"creditAccountId,string"` //账期结算id | 7 | CreditAccountId int `json:"creditAccountId,string"` //账期结算id |
8 | ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额 | 8 | ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额 |
9 | Remarks string `json:"remarks"` //备注 | 9 | Remarks string `json:"remarks"` //备注 |
10 | - Attachment domain.Attachment `json:"attachment"` //附件 | 10 | + Attachment []domain.Attachment `json:"attachment"` //附件 |
11 | } | 11 | } |
@@ -170,7 +170,7 @@ type ( | @@ -170,7 +170,7 @@ type ( | ||
170 | 170 | ||
171 | ReqCooperationContractAdd struct { | 171 | ReqCooperationContractAdd struct { |
172 | CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述 | 172 | CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述 |
173 | - CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 | 173 | + // CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 |
174 | CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号, | 174 | CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号, |
175 | DepartmentId string `json:"departmentId"` // 共创合约发起部门id | 175 | DepartmentId string `json:"departmentId"` // 共创合约发起部门id |
176 | CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开 | 176 | CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开 |
@@ -197,7 +197,7 @@ type ( | @@ -197,7 +197,7 @@ type ( | ||
197 | ReqCooperationContractUpdate struct { | 197 | ReqCooperationContractUpdate struct { |
198 | CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id | 198 | CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id |
199 | CooperationContractDescription string `json:"cooperationContractDescription"` //共创 | 199 | CooperationContractDescription string `json:"cooperationContractDescription"` //共创 |
200 | - CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 | 200 | + // CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 |
201 | CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号, | 201 | CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号, |
202 | DepartmentId string `json:"departmentId"` // 共创合约发起部门id | 202 | DepartmentId string `json:"departmentId"` // 共创合约发起部门id |
203 | CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开 | 203 | CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开 |
@@ -54,7 +54,7 @@ type ( | @@ -54,7 +54,7 @@ type ( | ||
54 | CreditAccountId int `json:"creditAccountId,string"` | 54 | CreditAccountId int `json:"creditAccountId,string"` |
55 | ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额 | 55 | ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额 |
56 | Remarks string `json:"remarks"` | 56 | Remarks string `json:"remarks"` |
57 | - Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件 | 57 | + Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件 |
58 | } | 58 | } |
59 | 59 | ||
60 | DataCreditAccountsPay struct { | 60 | DataCreditAccountsPay struct { |
-
请 注册 或 登录 后发表评论