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

转到一个项目

作者 tangxuhui
提交 7468435ca89539bd42e1e6de2305e5cb57932343 1 个父辈 d63980bd

修复bug

内嵌 并排对比
正在显示 3 个修改的文件 包含 4 行增加 和 2 行删除
@@ -9,7 +9,6 @@ type CooperationContractItem struct { @@ -9,7 +9,6 @@ type CooperationContractItem struct {
9 CooperationContractId int `json:"cooperationContractId,string,"` 9 CooperationContractId int `json:"cooperationContractId,string,"`
10 CooperationContractNumber string `json:"cooperationContractNumber"` //合约编号 10 CooperationContractNumber string `json:"cooperationContractNumber"` //合约编号
11 CooperationProjectNumber string `json:"cooperationProjectNumber"` //项目编号 11 CooperationProjectNumber string `json:"cooperationProjectNumber"` //项目编号
12 - CooperationProjectId string `json:"cooperationProjectId"` //项目编号  
13 CooperationContractName string `json:"cooperationContractName"` //合约名称 12 CooperationContractName string `json:"cooperationContractName"` //合约名称
14 Status int `json:"status"` //合约状态 13 Status int `json:"status"` //合约状态
15 CreateTime int `json:"createTime"` 14 CreateTime int `json:"createTime"`
@@ -35,7 +34,6 @@ func ToCooperationContractItem(param *allied_creation_cooperation.CooperationCon @@ -35,7 +34,6 @@ func ToCooperationContractItem(param *allied_creation_cooperation.CooperationCon
35 CooperationContractDescription: param.CooperationContractDescription, 34 CooperationContractDescription: param.CooperationContractDescription,
36 CooperationContractId: param.CooperationContractId, 35 CooperationContractId: param.CooperationContractId,
37 CooperationProjectNumber: param.CooperationProjectNumber, 36 CooperationProjectNumber: param.CooperationProjectNumber,
38 - CooperationProjectId: param.CooperationProjectNumber,  
39 CooperationContractName: param.CooperationContractName, 37 CooperationContractName: param.CooperationContractName,
40 CooperationContractNumber: param.CooperationContractNumber, 38 CooperationContractNumber: param.CooperationContractNumber,
41 Status: param.Status, 39 Status: param.Status,
@@ -181,6 +179,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -181,6 +179,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
181 UsersName: v.UserInfo.UserName, 179 UsersName: v.UserInfo.UserName,
182 UsersId: v.UserId, 180 UsersId: v.UserId,
183 Phone: v.UserInfo.UserPhone, 181 Phone: v.UserInfo.UserPhone,
  182 + UserCode: v.UserInfo.UserCode,
184 }, 183 },
185 } 184 }
186 u.SalesmanUser.UserId = v.Salesman.UserId 185 u.SalesmanUser.UserId = v.Salesman.UserId
@@ -63,6 +63,7 @@ type CooperationContract struct { @@ -63,6 +63,7 @@ type CooperationContract struct {
63 UserName string `json:"userName"` // 共创人员姓名 63 UserName string `json:"userName"` // 共创人员姓名
64 UserPhone string `json:"userPhone"` // 用户手机号 64 UserPhone string `json:"userPhone"` // 用户手机号
65 UserAccount string `json:"userAccount"` // 用户账号，区别于手机号，冗余字段 65 UserAccount string `json:"userAccount"` // 用户账号，区别于手机号，冗余字段
  66 + UserCode string `json:"userCode"`
66 } `json:"userInfo"` 67 } `json:"userInfo"`
67 Department struct { 68 Department struct {
68 DepartmentId int64 `json:"departmentId,string,"` // 部门ID 69 DepartmentId int64 `json:"departmentId,string,"` // 部门ID
@@ -74,6 +74,7 @@ func (controller *CooperationContractController) EnableCooperationContract() { @@ -74,6 +74,7 @@ func (controller *CooperationContractController) EnableCooperationContract() {
74 controller.Response(nil, err) 74 controller.Response(nil, err)
75 return 75 return
76 } 76 }
  77 + enableCooperationContractCommand.Operator = controller.GetOperator()
77 data, err := cooperationContractService.EnableCooperationContract(enableCooperationContractCommand) 78 data, err := cooperationContractService.EnableCooperationContract(enableCooperationContractCommand)
78 controller.Response(data, err) 79 controller.Response(data, err)
79 } 80 }
@@ -101,6 +102,7 @@ func (controller *CooperationContractController) RemoveCooperationContract() { @@ -101,6 +102,7 @@ func (controller *CooperationContractController) RemoveCooperationContract() {
101 controller.Response(nil, err) 102 controller.Response(nil, err)
102 return 103 return
103 } 104 }
  105 + removeCooperationContractCommand.Operator = controller.GetOperator()
104 data, err := cooperationContractService.RemoveCooperationContract(removeCooperationContractCommand) 106 data, err := cooperationContractService.RemoveCooperationContract(removeCooperationContractCommand)
105 controller.Response(data, err) 107 controller.Response(data, err)
106 } 108 }