allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 c9046d2040f47c8784ee5086dd52d84f144619b7 1 个父辈 486139aa

feat:共创反馈信息功能开发

内嵌 并排对比
正在显示 7 个修改的文件 包含 25 行增加 和 32 行删除
@@ -19,13 +19,13 @@ type CreateContractUndertakerFeedbackCommand struct { @@ -19,13 +19,13 @@ type CreateContractUndertakerFeedbackCommand struct {
19 // 承接人uid 19 // 承接人uid
20 UnderTakerUid string `cname:"承接人uid" json:"underTakerUid,omitempty"` 20 UnderTakerUid string `cname:"承接人uid" json:"underTakerUid,omitempty"`
21 // 公司ID，通过集成REST上下文获取 21 // 公司ID，通过集成REST上下文获取
22 - CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 22 + CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
23 // 组织机构ID 23 // 组织机构ID
24 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 24 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
25 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 25 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
26 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 26 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
27 // 用户基础数据id 27 // 用户基础数据id
28 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 28 + UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string" valid:"Required"`
29 } 29 }
30 30
31 func (createContractUndertakerFeedbackCommand *CreateContractUndertakerFeedbackCommand) Valid(validation *validation.Validation) { 31 func (createContractUndertakerFeedbackCommand *CreateContractUndertakerFeedbackCommand) Valid(validation *validation.Validation) {
@@ -12,15 +12,15 @@ type RemoveContractUndertakerFeedbackCommand struct { @@ -12,15 +12,15 @@ type RemoveContractUndertakerFeedbackCommand struct {
12 // 合约承接方反馈记录ID 12 // 合约承接方反馈记录ID
13 FeedbackId string `cname:"合约承接方反馈记录ID" json:"feedbackId" valid:"Required"` 13 FeedbackId string `cname:"合约承接方反馈记录ID" json:"feedbackId" valid:"Required"`
14 // 承接人uid 14 // 承接人uid
15 - UnderTakerUid string `cname:"承接人uid" json:"underTakerUid,omitempty"` 15 + UnderTakerUid string `cname:"承接人UID" json:"underTakerUid,omitempty"`
16 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
17 - CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 + CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
18 // 组织机构ID 18 // 组织机构ID
19 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 19 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
20 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 20 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
21 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 21 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
22 // 用户基础数据id 22 // 用户基础数据id
23 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 23 + UserBaseId int64 `cname:"用户基础数据" json:"userBaseId,string" valid:"Required"`
24 } 24 }
25 25
26 func (removeContractUndertakerFeedbackCommand *RemoveContractUndertakerFeedbackCommand) Valid(validation *validation.Validation) { 26 func (removeContractUndertakerFeedbackCommand *RemoveContractUndertakerFeedbackCommand) Valid(validation *validation.Validation) {
@@ -11,7 +11,7 @@ import ( @@ -11,7 +11,7 @@ import (
11 11
12 type UpdateContractUndertakerFeedbackCommand struct { 12 type UpdateContractUndertakerFeedbackCommand struct {
13 // 合约承接方信息反馈id 13 // 合约承接方信息反馈id
14 - FeedbackId string `cname:"合约承接方反馈信息id" json:"feedbackId" valid:"Required"` 14 + FeedbackId string `cname:"合约承接方反馈信息ID" json:"feedbackId" valid:"Required"`
15 // 合约承接方反馈内容附件 15 // 合约承接方反馈内容附件
16 FeedbackAttachment []*domain.Attachment `cname:"合约承接方反馈内容附件" json:"feedbackAttachment" valid:"Required"` 16 FeedbackAttachment []*domain.Attachment `cname:"合约承接方反馈内容附件" json:"feedbackAttachment" valid:"Required"`
17 // 合约承接方反馈内容 17 // 合约承接方反馈内容
@@ -19,15 +19,15 @@ type UpdateContractUndertakerFeedbackCommand struct { @@ -19,15 +19,15 @@ type UpdateContractUndertakerFeedbackCommand struct {
19 // 共创合约编号 19 // 共创合约编号
20 CooperationContractNumber string `cname:"共创合约编号" json:"cooperationContractNumber" valid:"Required"` 20 CooperationContractNumber string `cname:"共创合约编号" json:"cooperationContractNumber" valid:"Required"`
21 // 承接人用户uid 21 // 承接人用户uid
22 - UnderTakerUid string `cname:"承接人用户uid" json:"underTakerUid,omitempty"` 22 + UnderTakerUid string `cname:"承接人用户UID" json:"underTakerUid,omitempty"`
23 // 公司ID，通过集成REST上下文获取 23 // 公司ID，通过集成REST上下文获取
24 - CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 24 + CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
25 // 组织机构ID 25 // 组织机构ID
26 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 26 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
27 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 27 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
28 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 28 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
29 // 用户基础数据id 29 // 用户基础数据id
30 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 30 + UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string" valid:"Required"`
31 } 31 }
32 32
33 func (updateContractUndertakerFeedbackCommand *UpdateContractUndertakerFeedbackCommand) Valid(validation *validation.Validation) { 33 func (updateContractUndertakerFeedbackCommand *UpdateContractUndertakerFeedbackCommand) Valid(validation *validation.Validation) {
@@ -12,15 +12,15 @@ type GetContractUndertakerFeedbackQuery struct { @@ -12,15 +12,15 @@ type GetContractUndertakerFeedbackQuery struct {
12 // 合约承接方反馈记录ID 12 // 合约承接方反馈记录ID
13 FeedbackId string `cname:"合约承接方反馈记录ID" json:"feedbackId" valid:"Required"` 13 FeedbackId string `cname:"合约承接方反馈记录ID" json:"feedbackId" valid:"Required"`
14 // 承接人uid 14 // 承接人uid
15 - UnderTakerUid string `cname:"承接人uid" json:"underTakerUid,omitempty"` 15 + UnderTakerUid string `cname:"承接人UID" json:"underTakerUid,omitempty"`
16 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
17 - CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 + CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
18 // 组织机构ID 18 // 组织机构ID
19 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 19 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
20 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 20 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
21 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 21 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
22 // 用户基础数据id 22 // 用户基础数据id
23 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 23 + UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string" valid:"Required"`
24 } 24 }
25 25
26 func (getContractUndertakerFeedbackQuery *GetContractUndertakerFeedbackQuery) Valid(validation *validation.Validation) { 26 func (getContractUndertakerFeedbackQuery *GetContractUndertakerFeedbackQuery) Valid(validation *validation.Validation) {
@@ -10,13 +10,13 @@ import ( @@ -10,13 +10,13 @@ import (
10 10
11 type ListContractUndertakerFeedbackQuery struct { 11 type ListContractUndertakerFeedbackQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页码" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"` 15 PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 承接人uid 16 // 承接人uid
17 - UnderTakerUid string `cname:"承接人uid" json:"underTakerUid" valid:"Required"` 17 + UnderTakerUid string `cname:"承接人UID" json:"underTakerUid" valid:"Required"`
18 // 公司ID，通过集成REST上下文获取 18 // 公司ID，通过集成REST上下文获取
19 - CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 19 + CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
20 // 组织机构ID 20 // 组织机构ID
21 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 21 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
22 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 22 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
@@ -10,21 +10,21 @@ import ( @@ -10,21 +10,21 @@ import (
10 10
11 type SearchContractUndertakerFeedbackQuery struct { 11 type SearchContractUndertakerFeedbackQuery struct {
12 // 公司ID，通过集成REST上下文获取 12 // 公司ID，通过集成REST上下文获取
13 - CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 13 + CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
14 // 组织机构ID 14 // 组织机构ID
15 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 15 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
16 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 16 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
17 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 17 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
18 // 用户基础数据id 18 // 用户基础数据id
19 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 19 + UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string" valid:"Required"`
20 // 共创合约名称 20 // 共创合约名称
21 - CooperationContractName string `cname:"共创合约名称" json:"cooperationContractName" valid:"Required"` 21 + CooperationContractName string `cname:"共创合约名称" json:"cooperationContractName,omitempty"`
22 // 承接人姓名 22 // 承接人姓名
23 UndertakerName string `cname:"承接人姓名" json:"undertakerName,omitempty"` 23 UndertakerName string `cname:"承接人姓名" json:"undertakerName,omitempty"`
24 // 查询关键词 24 // 查询关键词
25 MatchWord string `cname:"查询关键词" json:"matchWord,omitempty"` 25 MatchWord string `cname:"查询关键词" json:"matchWord,omitempty"`
26 // 页面大小 26 // 页面大小
27 - PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"` 27 + PageNumber int64 `cname:"页码" json:"pageNumber,omitempty"`
28 // 页面大小 28 // 页面大小
29 PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"` 29 PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
30 } 30 }
@@ -61,13 +61,11 @@ func (controller *ContractUndertakerFeedbackController) RemoveContractUndertaker @@ -61,13 +61,11 @@ func (controller *ContractUndertakerFeedbackController) RemoveContractUndertaker
61 contractUndertakerFeedbackService := service.NewContractUndertakerFeedbackService(nil) 61 contractUndertakerFeedbackService := service.NewContractUndertakerFeedbackService(nil)
62 removeContractUndertakerFeedbackCommand := &command.RemoveContractUndertakerFeedbackCommand{} 62 removeContractUndertakerFeedbackCommand := &command.RemoveContractUndertakerFeedbackCommand{}
63 _ = controller.Unmarshal(removeContractUndertakerFeedbackCommand) 63 _ = controller.Unmarshal(removeContractUndertakerFeedbackCommand)
64 - // 解析头部信息  
65 header := controller.GetRequestHeader(controller.Ctx) 64 header := controller.GetRequestHeader(controller.Ctx)
66 removeContractUndertakerFeedbackCommand.CompanyId = header.CompanyId 65 removeContractUndertakerFeedbackCommand.CompanyId = header.CompanyId
67 removeContractUndertakerFeedbackCommand.OrgId = header.OrgId 66 removeContractUndertakerFeedbackCommand.OrgId = header.OrgId
68 removeContractUndertakerFeedbackCommand.UserId = header.UserId 67 removeContractUndertakerFeedbackCommand.UserId = header.UserId
69 removeContractUndertakerFeedbackCommand.UserBaseId = header.UserBaseId 68 removeContractUndertakerFeedbackCommand.UserBaseId = header.UserBaseId
70 - // 解析路径参数  
71 contractUndertakerFeedbackId := controller.GetString(":contractUndertakerFeedbackId") 69 contractUndertakerFeedbackId := controller.GetString(":contractUndertakerFeedbackId")
72 removeContractUndertakerFeedbackCommand.FeedbackId = contractUndertakerFeedbackId 70 removeContractUndertakerFeedbackCommand.FeedbackId = contractUndertakerFeedbackId
73 data, err := contractUndertakerFeedbackService.RemoveContractUndertakerFeedback(removeContractUndertakerFeedbackCommand) 71 data, err := contractUndertakerFeedbackService.RemoveContractUndertakerFeedback(removeContractUndertakerFeedbackCommand)
@@ -77,17 +75,12 @@ func (controller *ContractUndertakerFeedbackController) RemoveContractUndertaker @@ -77,17 +75,12 @@ func (controller *ContractUndertakerFeedbackController) RemoveContractUndertaker
77 func (controller *ContractUndertakerFeedbackController) SearchContractUndertakerFeedback() { 75 func (controller *ContractUndertakerFeedbackController) SearchContractUndertakerFeedback() {
78 contractUndertakerFeedbackService := service.NewContractUndertakerFeedbackService(nil) 76 contractUndertakerFeedbackService := service.NewContractUndertakerFeedbackService(nil)
79 searchContractUndertakerFeedbackQuery := &query.SearchContractUndertakerFeedbackQuery{} 77 searchContractUndertakerFeedbackQuery := &query.SearchContractUndertakerFeedbackQuery{}
80 - // 解析头部信息 78 + _ = controller.Unmarshal(searchContractUndertakerFeedbackQuery)
81 header := controller.GetRequestHeader(controller.Ctx) 79 header := controller.GetRequestHeader(controller.Ctx)
82 searchContractUndertakerFeedbackQuery.CompanyId = header.CompanyId 80 searchContractUndertakerFeedbackQuery.CompanyId = header.CompanyId
83 searchContractUndertakerFeedbackQuery.OrgId = header.OrgId 81 searchContractUndertakerFeedbackQuery.OrgId = header.OrgId
84 searchContractUndertakerFeedbackQuery.UserId = header.UserId 82 searchContractUndertakerFeedbackQuery.UserId = header.UserId
85 searchContractUndertakerFeedbackQuery.UserBaseId = header.UserBaseId 83 searchContractUndertakerFeedbackQuery.UserBaseId = header.UserBaseId
86 - // 获取路径参数  
87 - pageSize, _ := controller.GetInt64("pageSize")  
88 - searchContractUndertakerFeedbackQuery.PageSize = pageSize  
89 - pageNumber, _ := controller.GetInt64("pageNumber")  
90 - searchContractUndertakerFeedbackQuery.PageNumber = pageNumber  
91 data, err := contractUndertakerFeedbackService.SearchContractUndertakerFeedback(searchContractUndertakerFeedbackQuery) 84 data, err := contractUndertakerFeedbackService.SearchContractUndertakerFeedback(searchContractUndertakerFeedbackQuery)
92 controller.Response(data, err) 85 controller.Response(data, err)
93 } 86 }