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

转到一个项目

作者 tangxuhui
提交 eccd60c872dd14b15733ee954371692a3c3af2f8 1 个父辈 d7d6e638

调试，修复

内嵌 并排对比
正在显示 5 个修改的文件 包含 16 行增加 和 15 行删除
@@ -12,14 +12,14 @@ type CreateCooperationProjectCommand struct { @@ -12,14 +12,14 @@ type CreateCooperationProjectCommand struct {
12 Operator domain.Operator `json:"-"` 12 Operator domain.Operator `json:"-"`
13 // 模式编码，唯一确定 13 // 模式编码，唯一确定
14 CooperationModeNumber string `json:"cooperationModeNumber" valid:"Required"` 14 CooperationModeNumber string `json:"cooperationModeNumber" valid:"Required"`
15 - // 发起组织ID  
16 - OrgId int64 `json:"departmentId"` 15 + // 发起部门ID
  16 + DepartmentId int64 `json:"departmentId,string"`
17 // 共创项目名称 17 // 共创项目名称
18 CooperationProjectName string `json:"cooperationProjectName" valid:"Required"` 18 CooperationProjectName string `json:"cooperationProjectName" valid:"Required"`
19 // 共创发起人id 19 // 共创发起人id
20 CooperationProjectSponsor int `json:"cooperationProjectSponsor,string,"` 20 CooperationProjectSponsor int `json:"cooperationProjectSponsor,string,"`
21 // 项目承接对象 21 // 项目承接对象
22 - CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerTypes"` 22 + CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerType"`
23 // 共创项目描述 23 // 共创项目描述
24 CooperationProjectDescription string `json:"cooperationProjectDescription" valid:"Required"` 24 CooperationProjectDescription string `json:"cooperationProjectDescription" valid:"Required"`
25 //图片 25 //图片
@@ -14,8 +14,8 @@ type UpdateCooperationProjectCommand struct { @@ -14,8 +14,8 @@ type UpdateCooperationProjectCommand struct {
14 CooperationProjectId string `json:"cooperationProjectId" valid:"Required"` 14 CooperationProjectId string `json:"cooperationProjectId" valid:"Required"`
15 // 模式编码，唯一确定 15 // 模式编码，唯一确定
16 CooperationModeNumber string `json:"cooperationModeNumber" valid:"Required"` 16 CooperationModeNumber string `json:"cooperationModeNumber" valid:"Required"`
17 - // 组织ID  
18 - OrgId int64 `json:"departmentId,string" valid:"Required"` 17 + // 发起部门ID
  18 + DepartmentId int `json:"departmentId,string" valid:"Required"`
19 // 共创项目名称 19 // 共创项目名称
20 CooperationProjectName string `json:"cooperationProjectName" valid:"Required"` 20 CooperationProjectName string `json:"cooperationProjectName" valid:"Required"`
21 // 共创发起人id 21 // 共创发起人id
@@ -34,6 +34,7 @@ func (cooperationProjectService *CooperationProjectService) CreateCooperationPro @@ -34,6 +34,7 @@ func (cooperationProjectService *CooperationProjectService) CreateCooperationPro
34 CooperationModeNumber: createCooperationProjectCommand.CooperationModeNumber, 34 CooperationModeNumber: createCooperationProjectCommand.CooperationModeNumber,
35 PublisherUid: int(createCooperationProjectCommand.Operator.UserId), 35 PublisherUid: int(createCooperationProjectCommand.Operator.UserId),
36 SponsorUid: createCooperationProjectCommand.CooperationProjectSponsor, 36 SponsorUid: createCooperationProjectCommand.CooperationProjectSponsor,
  37 + DepartmentId: int(createCooperationProjectCommand.DepartmentId),
37 CooperationProjectUndertakerType: createCooperationProjectCommand.CooperationProjectUndertakerType, 38 CooperationProjectUndertakerType: createCooperationProjectCommand.CooperationProjectUndertakerType,
38 Attachment: images, 39 Attachment: images,
39 }) 40 })
@@ -149,9 +150,7 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro @@ -149,9 +150,7 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro
149 PublisherUid: strconv.Itoa(int(updateCooperationProjectCommand.Operator.UserId)), 150 PublisherUid: strconv.Itoa(int(updateCooperationProjectCommand.Operator.UserId)),
150 CooperationProjectDescription: updateCooperationProjectCommand.CooperationProjectDescription, 151 CooperationProjectDescription: updateCooperationProjectCommand.CooperationProjectDescription,
151 Attachment: images, 152 Attachment: images,
152 - UserId: updateCooperationProjectCommand.Operator.UserId,  
153 - UserBaseId: updateCooperationProjectCommand.Operator.UserBaseId,  
154 - OrgId: updateCooperationProjectCommand.OrgId, 153 + DepartmentId: updateCooperationProjectCommand.DepartmentId,
155 }) 154 })
156 if err != nil { 155 if err != nil {
157 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 156 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -15,10 +15,10 @@ var HTTP_PORT int = 8083 @@ -15,10 +15,10 @@ var HTTP_PORT int = 8083
15 var ALLIED_CREATION_BASIC_HOST = "http://localhost:8080" 15 var ALLIED_CREATION_BASIC_HOST = "http://localhost:8080"
16 16
17 //天联共创用户模块 17 //天联共创用户模块
18 -var ALLIED_CREATION_USER_HOST = "http://allied-creation-user-dev.fjmaimaimai.com" 18 +var ALLIED_CREATION_USER_HOST = "http://localhost:8081" //"http://allied-creation-user-dev.fjmaimaimai.com"
19 19
20 //天联共创业务模块 20 //天联共创业务模块
21 -var ALLIED_CREATION_COOPERATION_HOST = "http://allied-creation-cooperation-dev.fjmaimaimai.com" 21 +var ALLIED_CREATION_COOPERATION_HOST = "http://localhost:8082" // "http://allied-creation-cooperation-dev.fjmaimaimai.com"
22 22
23 //通用模块短信服务 23 //通用模块短信服务
24 var SMS_SERVE_HOST = "https://sms.fjmaimaimai.com:9897" 24 var SMS_SERVE_HOST = "https://sms.fjmaimaimai.com:9897"
1 package allied_creation_cooperation 1 package allied_creation_cooperation
2 2
3 import ( 3 import (
  4 + "time"
  5 +
4 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" 6 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
5 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/util/jtime" 7 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/util/jtime"
6 - "time"  
7 ) 8 )
8 9
9 type ProjectAttachment struct { 10 type ProjectAttachment struct {
@@ -116,12 +117,13 @@ type ( @@ -116,12 +117,13 @@ type (
116 // 共创项目描述 117 // 共创项目描述
117 CooperationProjectDescription string `json:"cooperationProjectDescription"` 118 CooperationProjectDescription string `json:"cooperationProjectDescription"`
118 Attachment []domain.Attachment `json:"attachment"` 119 Attachment []domain.Attachment `json:"attachment"`
  120 + DepartmentId int `json:"departmentId,string"`
119 // 组织机构ID 121 // 组织机构ID
120 - OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 122 + // OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
121 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 123 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
122 - UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"` 124 + //UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
123 // 用户基础数据id 125 // 用户基础数据id
124 - UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string" valid:"Required"` 126 + //UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string" valid:"Required"`
125 } 127 }
126 128
127 DataCooperationProjectUpdate struct { 129 DataCooperationProjectUpdate struct {
@@ -268,7 +270,7 @@ type ( @@ -268,7 +270,7 @@ type (
268 // 批量结束项目 270 // 批量结束项目
269 type ( 271 type (
270 ReqCooperationProjectBatchEnd struct { 272 ReqCooperationProjectBatchEnd struct {
271 - CooperationProjectIds []string `json:"cooperationProjectId"` 273 + CooperationProjectIds []string `json:"cooperationProjectIds"`
272 } 274 }
273 275
274 DataCooperationProjectBatchEnd struct { 276 DataCooperationProjectBatchEnd struct {