作者 tangxuhui

修正部分问题

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