作者 tangxuhui

修正部分问题

@@ -14,10 +14,10 @@ type CooperationApplicationItem struct { @@ -14,10 +14,10 @@ type CooperationApplicationItem struct {
14 CooperationProjectNumber string `json:"cooperationProjectNumber"` //共创编号 14 CooperationProjectNumber string `json:"cooperationProjectNumber"` //共创编号
15 } `json:"cooperationProject"` 15 } `json:"cooperationProject"`
16 CooperationApplicationApplicant struct { 16 CooperationApplicationApplicant struct {
17 - UserName string `json:"userName"` //申请人名字  
18 - UserCode string `json:"userCode"` 17 + UserName string `json:"usersName"` //申请人名字
  18 + UserCode string `json:"usersCode"`
19 DepartmentName string `json:"departmentName"` //申请人部门 19 DepartmentName string `json:"departmentName"` //申请人部门
20 - Phone string `json:"userPhone"` //申请人电话 20 + Phone string `json:"Phone"` //申请人电话
21 } `json:"cooperationApplicationApplicant"` 21 } `json:"cooperationApplicationApplicant"`
22 CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` //附件 22 CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` //附件
23 CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述 23 CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述
@@ -26,8 +26,7 @@ type CooperationApplicationItem struct { @@ -26,8 +26,7 @@ type CooperationApplicationItem struct {
26 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述 26 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述
27 CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` //审核时间 27 CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` //审核时间
28 CooperationApplicationStatus int `json:"cooperationApplicationStatus"` // 28 CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //
29 -  
30 - Org struct { 29 + Org struct {
31 OrgID int `json:"orgId"` 30 OrgID int `json:"orgId"`
32 OrgName string `json:"orgName"` 31 OrgName string `json:"orgName"`
33 } `json:"org"` //组织 32 } `json:"org"` //组织
@@ -18,8 +18,8 @@ type ListCooperationApplicationQuery struct { @@ -18,8 +18,8 @@ type ListCooperationApplicationQuery struct {
18 ProjectName string `json:"projectName"` 18 ProjectName string `json:"projectName"`
19 //申请人名称 19 //申请人名称
20 ApplicantName string `json:"applicantName"` 20 ApplicantName string `json:"applicantName"`
21 - //审核状态  
22 - VerifyStatus int `json:"verifyStatus"` 21 + //只显示待审核
  22 + WaitAuditOnly bool `json:"waitAuditOnly"`
23 } 23 }
24 24
25 func (listCooperationApplicationQuery *ListCooperationApplicationQuery) Valid(validation *validation.Validation) { 25 func (listCooperationApplicationQuery *ListCooperationApplicationQuery) Valid(validation *validation.Validation) {
@@ -60,10 +60,15 @@ func (cooperationApplicationService *CooperationApplicationService) ListCooperat @@ -60,10 +60,15 @@ func (cooperationApplicationService *CooperationApplicationService) ListCooperat
60 if err := listCooperationApplicationQuery.ValidateQuery(); err != nil { 60 if err := listCooperationApplicationQuery.ValidateQuery(); err != nil {
61 return 0, nil, application.ThrowError(application.ARG_ERROR, err.Error()) 61 return 0, nil, application.ThrowError(application.ARG_ERROR, err.Error())
62 } 62 }
  63 + cooperationApplicationStatus := 0
  64 + if listCooperationApplicationQuery.WaitAuditOnly {
  65 + cooperationApplicationStatus = 1
  66 + }
  67 +
63 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationApplicationQuery.Operator) 68 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationApplicationQuery.Operator)
64 result, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{ 69 result, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{
65 ApplicantName: listCooperationApplicationQuery.ApplicantName, 70 ApplicantName: listCooperationApplicationQuery.ApplicantName,
66 - CooperationApplicationStatus: listCooperationApplicationQuery.VerifyStatus, 71 + CooperationApplicationStatus: cooperationApplicationStatus,
67 CooperationProjectName: listCooperationApplicationQuery.ProjectName, 72 CooperationProjectName: listCooperationApplicationQuery.ProjectName,
68 PageNumber: listCooperationApplicationQuery.PageNumber, 73 PageNumber: listCooperationApplicationQuery.PageNumber,
69 PageSize: listCooperationApplicationQuery.PageSize, 74 PageSize: listCooperationApplicationQuery.PageSize,