作者 陈志颖

Merge branch 'dev-chenzhiying' into dev

@@ -2,6 +2,7 @@ package command @@ -2,6 +2,7 @@ package command
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
  5 + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
5 "reflect" 6 "reflect"
6 "strings" 7 "strings"
7 8
@@ -23,6 +24,8 @@ type UpdateCooperationProjectCommand struct { @@ -23,6 +24,8 @@ type UpdateCooperationProjectCommand struct {
23 PublisherUid string `cname:"共创项目发布人UID" json:"publisherUid" valid:"Required"` 24 PublisherUid string `cname:"共创项目发布人UID" json:"publisherUid" valid:"Required"`
24 // 共创项目描述 25 // 共创项目描述
25 CooperationProjectDescription string `cname:"共创项目描述" json:"cooperationProjectDescription,omitempty"` 26 CooperationProjectDescription string `cname:"共创项目描述" json:"cooperationProjectDescription,omitempty"`
  27 + // 附件
  28 + Attachment []*domain.Attachment `cname:"共创项目附件" json:"attachment,omitempty"`
26 // 公司ID,通过集成REST上下文获取 29 // 公司ID,通过集成REST上下文获取
27 CompanyId int64 `cname:"公司ID" json:"companyId" valid:"Required"` 30 CompanyId int64 `cname:"公司ID" json:"companyId" valid:"Required"`
28 // 组织机构ID 31 // 组织机构ID
@@ -34,7 +37,6 @@ type UpdateCooperationProjectCommand struct { @@ -34,7 +37,6 @@ type UpdateCooperationProjectCommand struct {
34 } 37 }
35 38
36 func (updateCooperationProjectCommand *UpdateCooperationProjectCommand) Valid(validation *validation.Validation) { 39 func (updateCooperationProjectCommand *UpdateCooperationProjectCommand) Valid(validation *validation.Validation) {
37 - //validation.SetError("CustomValid", "未实现的自定义认证")  
38 } 40 }
39 41
40 func (updateCooperationProjectCommand *UpdateCooperationProjectCommand) ValidateCommand() error { 42 func (updateCooperationProjectCommand *UpdateCooperationProjectCommand) ValidateCommand() error {
@@ -83,5 +83,8 @@ func (cooperationProject *CooperationProject) Update(data map[string]interface{} @@ -83,5 +83,8 @@ func (cooperationProject *CooperationProject) Update(data map[string]interface{}
83 if status, ok := data["status"]; ok { 83 if status, ok := data["status"]; ok {
84 cooperationProject.Status = status.(int32) 84 cooperationProject.Status = status.(int32)
85 } 85 }
  86 + if attachment, ok := data["attachment"]; ok {
  87 + cooperationProject.Attachment = attachment.([]*Attachment)
  88 + }
86 return nil 89 return nil
87 } 90 }