allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 tangxuhui
提交 b380793e37ad4b3eaadddb09c8fe96c896fe8176 1 个父辈 8915bbe6

更新

内嵌 并排对比
正在显示 5 个修改的文件 包含 20 行增加 和 16 行删除
@@ -34,7 +34,7 @@ func ToCooperationProjectItem(projecetParam *allied_creation_cooperation.Coopera @@ -34,7 +34,7 @@ func ToCooperationProjectItem(projecetParam *allied_creation_cooperation.Coopera
34 } 34 }
35 data.CooperationProjectSponsor.UsersId = projecetParam.CooperationProjectSponsor.UsersId 35 data.CooperationProjectSponsor.UsersId = projecetParam.CooperationProjectSponsor.UsersId
36 data.CooperationProjectSponsor.UserInfo.UsersId = projecetParam.CooperationProjectSponsor.UsersId 36 data.CooperationProjectSponsor.UserInfo.UsersId = projecetParam.CooperationProjectSponsor.UsersId
37 - data.CooperationProjectSponsor.UserInfo.Phone = projecetParam.CooperationProjectSponsor.UserInfo.Phone 37 + data.CooperationProjectSponsor.UserInfo.Phone = projecetParam.CooperationProjectSponsor.UserInfo.UserPhone
38 data.CooperationProjectSponsor.UserInfo.UsersName = projecetParam.CooperationProjectSponsor.UserInfo.UsersName 38 data.CooperationProjectSponsor.UserInfo.UsersName = projecetParam.CooperationProjectSponsor.UserInfo.UsersName
39 return &data 39 return &data
40 } 40 }
@@ -77,7 +77,7 @@ func ToCooperationProjectInfo(projecetParam *allied_creation_cooperation.Coopera @@ -77,7 +77,7 @@ func ToCooperationProjectInfo(projecetParam *allied_creation_cooperation.Coopera
77 } 77 }
78 data.CooperationProjectSponsor.UsersId = projecetParam.CooperationProjectSponsor.UsersId 78 data.CooperationProjectSponsor.UsersId = projecetParam.CooperationProjectSponsor.UsersId
79 data.CooperationProjectSponsor.UserInfo.UsersId = projecetParam.CooperationProjectSponsor.UsersId 79 data.CooperationProjectSponsor.UserInfo.UsersId = projecetParam.CooperationProjectSponsor.UsersId
80 - data.CooperationProjectSponsor.UserInfo.Phone = projecetParam.CooperationProjectSponsor.UserInfo.Phone 80 + data.CooperationProjectSponsor.UserInfo.Phone = projecetParam.CooperationProjectSponsor.UserInfo.UserPhone
81 data.CooperationProjectSponsor.UserInfo.UsersName = projecetParam.CooperationProjectSponsor.UserInfo.UsersName 81 data.CooperationProjectSponsor.UserInfo.UsersName = projecetParam.CooperationProjectSponsor.UserInfo.UsersName
82 return &data 82 return &data
83 } 83 }
@@ -70,7 +70,10 @@ func ToCooperationProjectInfo(param *allied_creation_cooperation.CooperationProj @@ -70,7 +70,10 @@ func ToCooperationProjectInfo(param *allied_creation_cooperation.CooperationProj
70 data.CooperationProjectSponsor.UsersCode = param.CooperationProjectSponsor.UserInfo.UsersCode 70 data.CooperationProjectSponsor.UsersCode = param.CooperationProjectSponsor.UserInfo.UsersCode
71 data.CooperationProjectSponsor.UsersName = param.CooperationProjectSponsor.UserInfo.UsersName 71 data.CooperationProjectSponsor.UsersName = param.CooperationProjectSponsor.UserInfo.UsersName
72 data.CooperationProjectSponsor.UserId = param.CooperationProjectSponsor.UsersId 72 data.CooperationProjectSponsor.UserId = param.CooperationProjectSponsor.UsersId
73 - data.CooperationProjectSponsor.UserInfo = param.CooperationProjectSponsor.UserInfo 73 + data.CooperationProjectSponsor.UserInfo.Phone = param.CooperationProjectSponsor.UserInfo.UserPhone
  74 + data.CooperationProjectSponsor.UserInfo.UsersId = param.CooperationProjectSponsor.UsersId
  75 + data.CooperationProjectSponsor.UserInfo.UsersName = param.CooperationProjectSponsor.UserInfo.UsersName
  76 + data.CooperationProjectSponsor.UserInfo.UsersCode = param.CooperationProjectSponsor.UserInfo.UsersCode
74 return &data 77 return &data
75 } 78 }
76 79
@@ -88,7 +88,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec @@ -88,7 +88,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec
88 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 88 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
89 } 89 }
90 var ( 90 var (
91 - applications []dto.CooperationApplicationItem 91 + applications = []dto.CooperationApplicationItem{}
92 ) 92 )
93 for i := range resultApplication.Grid.List { 93 for i := range resultApplication.Grid.List {
94 item := dto.ToCooperationApplicationItem(&resultApplication.Grid.List[i]) 94 item := dto.ToCooperationApplicationItem(&resultApplication.Grid.List[i])
@@ -38,19 +38,19 @@ type CooperationProject struct { @@ -38,19 +38,19 @@ type CooperationProject struct {
38 CooperationProjectPublisher struct { 38 CooperationProjectPublisher struct {
39 UsersId int `json:"userId,string"` 39 UsersId int `json:"userId,string"`
40 UserInfo struct { 40 UserInfo struct {
41 - UsersName string `json:"userName"`  
42 - UsersCode string `json:"userCode"`  
43 - Phone string `json:"phone"`  
44 - UsersId int `json:"userId,string,"` 41 + UsersName string `json:"userName"`
  42 + UsersCode string `json:"userCode"`
  43 + UserPhone string `json:"userPhone"`
  44 + UserAccount string `json:"userAccount"`
45 } `json:"userInfo"` 45 } `json:"userInfo"`
46 } `json:"cooperationProjectPublisher"` //项目发布人，即操作人 46 } `json:"cooperationProjectPublisher"` //项目发布人，即操作人
47 CooperationProjectSponsor struct { 47 CooperationProjectSponsor struct {
48 UsersId int `json:"userId,string"` 48 UsersId int `json:"userId,string"`
49 UserInfo struct { 49 UserInfo struct {
50 - UsersName string `json:"userName"`  
51 - UsersCode string `json:"userCode"`  
52 - Phone string `json:"phone"`  
53 - UsersId int `json:"userId,string"` 50 + UsersName string `json:"userName"`
  51 + UsersCode string `json:"userCode"`
  52 + UserPhone string `json:"userPhone"`
  53 + UserAccount string `json:"userAccount"`
54 } `json:"userInfo"` 54 } `json:"userInfo"`
55 } `json:"cooperationProjectSponsor"` //项目发起人 55 } `json:"cooperationProjectSponsor"` //项目发起人
56 CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerTypes"` //共创合约承接对象，1员工，2共创用户，3公开 56 CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerTypes"` //共创合约承接对象，1员工，2共创用户，3公开
@@ -31,7 +31,9 @@ func (controller *DictionaryController) UpdateDictionary() { @@ -31,7 +31,9 @@ func (controller *DictionaryController) UpdateDictionary() {
31 if err != nil { 31 if err != nil {
32 log.Logger.Debug("json err:" + err.Error()) 32 log.Logger.Debug("json err:" + err.Error())
33 } 33 }
  34 + dictionaryId, _ := controller.GetInt64("::dictionaryId")
34 updateCommand.Operator = controller.GetOperator() 35 updateCommand.Operator = controller.GetOperator()
  36 + updateCommand.DictionaryId = dictionaryId
35 data, err := dictionaryService.UpdateDictionay(updateCommand) 37 data, err := dictionaryService.UpdateDictionay(updateCommand)
36 controller.Response(data, err) 38 controller.Response(data, err)
37 } 39 }
@@ -51,10 +53,9 @@ func (controller *DictionaryController) RemoveDictionary() { @@ -51,10 +53,9 @@ func (controller *DictionaryController) RemoveDictionary() {
51 func (controller *DictionaryController) GetDictionary() { 53 func (controller *DictionaryController) GetDictionary() {
52 dictionaryService := service.NewDictionayService(nil) 54 dictionaryService := service.NewDictionayService(nil)
53 getQuery := &query.GetDictionaryQuery{} 55 getQuery := &query.GetDictionaryQuery{}
54 - err := controller.Unmarshal(getQuery)  
55 - if err != nil {  
56 - log.Logger.Debug("json err:" + err.Error())  
57 - } 56 +
  57 + dictionaryId, _ := controller.GetInt64("::dictionaryId")
  58 + getQuery.DictionaryId = int(dictionaryId)
58 getQuery.Operator = controller.GetOperator() 59 getQuery.Operator = controller.GetOperator()
59 data, err := dictionaryService.GetDictionay(getQuery) 60 data, err := dictionaryService.GetDictionay(getQuery)
60 controller.Response(data, err) 61 controller.Response(data, err)