Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev
正在显示
14 个修改的文件
包含
424 行增加
和
236 行删除
| @@ -100,5 +100,5 @@ func (srv CooperationProjectService) SearchCooperationProject(projectQuery *comm | @@ -100,5 +100,5 @@ func (srv CooperationProjectService) SearchCooperationProject(projectQuery *comm | ||
| 100 | } | 100 | } |
| 101 | // var dataList []dto.CooperationProjectItem | 101 | // var dataList []dto.CooperationProjectItem |
| 102 | //TODO 数据填充 | 102 | //TODO 数据填充 |
| 103 | - return int(result.Total), result.CooperationProjects, nil | 103 | + return int(result.Total), result.List, nil |
| 104 | } | 104 | } |
| @@ -11,8 +11,8 @@ type AuditCooperationApplicationCommand struct { | @@ -11,8 +11,8 @@ type AuditCooperationApplicationCommand struct { | ||
| 11 | //操作人 | 11 | //操作人 |
| 12 | Operator domain.Operator `json:"-"` | 12 | Operator domain.Operator `json:"-"` |
| 13 | // 共创申请ID | 13 | // 共创申请ID |
| 14 | - CooperationApplicationId []int `json:"cooperationApplicationId,string" valid:"Required"` | ||
| 15 | - // 共创申请审核状态,1待审核,2已同意,3已拒绝 | 14 | + CooperationApplicationId []string `json:"cooperationApplicationId" valid:"Required"` |
| 15 | + // 审核动作,1同意,2拒绝 | ||
| 16 | CooperationApplicationStatus int `json:"cooperationApplicationStatus" valid:"Required"` | 16 | CooperationApplicationStatus int `json:"cooperationApplicationStatus" valid:"Required"` |
| 17 | // 共创申请审核描述 | 17 | // 共创申请审核描述 |
| 18 | CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription" valid:"Required"` | 18 | CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription" valid:"Required"` |
| @@ -20,24 +20,13 @@ func (cooperationApplicationService *CooperationApplicationService) AuditCoopera | @@ -20,24 +20,13 @@ func (cooperationApplicationService *CooperationApplicationService) AuditCoopera | ||
| 20 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( | 20 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( |
| 21 | auditCooperationApplicationCommand.Operator) | 21 | auditCooperationApplicationCommand.Operator) |
| 22 | 22 | ||
| 23 | - if auditCooperationApplicationCommand.CooperationApplicationStatus == 2 { | ||
| 24 | - _, err := creationCooperationGateway.CooperationApplicationsAgree(allied_creation_cooperation.ReqCooperationApplicationAgree{ | ||
| 25 | - CooperationApplicationId: auditCooperationApplicationCommand.CooperationApplicationId, | ||
| 26 | - CooperationApplicationVerifyDescription: auditCooperationApplicationCommand.CooperationApplicationVerifyDescription, | ||
| 27 | - }) | ||
| 28 | - if err != nil { | ||
| 29 | - return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 30 | - } | ||
| 31 | - } else if auditCooperationApplicationCommand.CooperationApplicationStatus == 3 { | ||
| 32 | - _, err := creationCooperationGateway.CooperationApplicationReject(allied_creation_cooperation.ReqCooperationApplicationReject{ | ||
| 33 | - CooperationApplicationId: auditCooperationApplicationCommand.CooperationApplicationId, | ||
| 34 | - CooperationApplicationVerifyDescription: auditCooperationApplicationCommand.CooperationApplicationVerifyDescription, | ||
| 35 | - }) | ||
| 36 | - if err != nil { | ||
| 37 | - return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 38 | - } | ||
| 39 | - } else { | ||
| 40 | - return nil, application.ThrowError(application.TRANSACTION_ERROR, "status 参数错误") | 23 | + _, err := creationCooperationGateway.CooperationApplicationsBatchApproval(allied_creation_cooperation.ReqCooperationApplicationBatchApproval{ |
| 24 | + CooperationApplicationIds: auditCooperationApplicationCommand.CooperationApplicationId, | ||
| 25 | + CooperationApplicationDescription: auditCooperationApplicationCommand.CooperationApplicationVerifyDescription, | ||
| 26 | + Action: auditCooperationApplicationCommand.CooperationApplicationStatus, | ||
| 27 | + }) | ||
| 28 | + if err != nil { | ||
| 29 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 41 | } | 30 | } |
| 42 | 31 | ||
| 43 | return auditCooperationApplicationCommand, nil | 32 | return auditCooperationApplicationCommand, nil |
| @@ -11,7 +11,7 @@ type RemoveCooperationModeCommand struct { | @@ -11,7 +11,7 @@ type RemoveCooperationModeCommand struct { | ||
| 11 | //操作人 | 11 | //操作人 |
| 12 | Operator domain.Operator `json:"-"` | 12 | Operator domain.Operator `json:"-"` |
| 13 | // 共创模式ID | 13 | // 共创模式ID |
| 14 | - CooperationModeId int `json:"cooperationModeId,string" valid:"Required"` | 14 | + CooperationModeId []string `json:"cooperationModeId" valid:"Required"` |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | func (removeCooperationModeCommand *RemoveCooperationModeCommand) Valid(validation *validation.Validation) { | 17 | func (removeCooperationModeCommand *RemoveCooperationModeCommand) Valid(validation *validation.Validation) { |
| @@ -99,10 +99,9 @@ func (cooperationModeService *CooperationModeService) RemoveCooperationMode(remo | @@ -99,10 +99,9 @@ func (cooperationModeService *CooperationModeService) RemoveCooperationMode(remo | ||
| 99 | return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | 99 | return nil, application.ThrowError(application.ARG_ERROR, err.Error()) |
| 100 | } | 100 | } |
| 101 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(removeCooperationModeCommand.Operator) | 101 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(removeCooperationModeCommand.Operator) |
| 102 | - _, err := creationCooperationGateway.CooperationModeRemove(allied_creation_cooperation.ReqCooperationModeRemove{ | ||
| 103 | - CooperationModeId: removeCooperationModeCommand.CooperationModeId, | 102 | + _, err := creationCooperationGateway.CooperationModeBatchRemove(allied_creation_cooperation.ReqCooperationModeBatchRemove{ |
| 103 | + CooperationModeIds: removeCooperationModeCommand.CooperationModeId, | ||
| 104 | }) | 104 | }) |
| 105 | - //TODO 改为批量删除 | ||
| 106 | if err != nil { | 105 | if err != nil { |
| 107 | return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 106 | return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
| 108 | } | 107 | } |
| 1 | +package dto | ||
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "time" | ||
| 5 | + | ||
| 6 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation" | ||
| 7 | +) | ||
| 8 | + | ||
| 9 | +type CooperationProjectInfo struct { | ||
| 10 | + Company struct { | ||
| 11 | + CompanyId int `json:"companyId,string,"` | ||
| 12 | + CompanyLogo string `json:"companyLogo"` | ||
| 13 | + CompanyName string `json:"companyName"` | ||
| 14 | + } `json:"company"` //项目归属企业 | ||
| 15 | + Org struct { | ||
| 16 | + OrgId int `json:"orgId"` | ||
| 17 | + OrgName string `json:"orgName"` | ||
| 18 | + } `json:"org"` //项目创建时的组织 | ||
| 19 | + CooperationMode struct { | ||
| 20 | + CooperationModeId int `json:"cooperationModeId,string,"` | ||
| 21 | + CooperationModeName string `json:"cooperationModeName"` | ||
| 22 | + CooperationModeNumber string `json:"cooperationModeNumber"` | ||
| 23 | + } `json:"cooperationMode"` //项目模式 | ||
| 24 | + CooperationProjectDescription string `json:"cooperationProjectDescription"` | ||
| 25 | + Attachment []struct { | ||
| 26 | + FileType string `json:"fileType"` | ||
| 27 | + Name string `json:"name"` | ||
| 28 | + Url string `json:"url"` | ||
| 29 | + FileSize int `json:"fileSize"` | ||
| 30 | + } `json:"attachment"` //图片附件 | ||
| 31 | + CooperationProjectId int `json:"cooperationProjectId,string,"` | ||
| 32 | + CooperationProjectName string `json:"cooperationProjectName"` | ||
| 33 | + CooperationProjectNumber string `json:"cooperationProjectNumber"` | ||
| 34 | + CooperationProjectPublishTime time.Time `json:"cooperationProjectPublishTime"` | ||
| 35 | + CreatedAt time.Time `json:"createdAt"` | ||
| 36 | + CooperationProjectSponsor struct { | ||
| 37 | + UsersId int `json:"usersId"` | ||
| 38 | + UsersName string `json:"usersName"` | ||
| 39 | + UsersCode string `json:"usersCode"` | ||
| 40 | + UserInfo struct { | ||
| 41 | + UsersName string `json:"usersName"` | ||
| 42 | + UsersCode string `json:"usersCode"` | ||
| 43 | + Phone string `json:"phone"` | ||
| 44 | + UsersId int `json:"userId,string,"` | ||
| 45 | + } `json:"userInfo"` | ||
| 46 | + } `json:"cooperationProjectSponsor"` //项目发起人 | ||
| 47 | + CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerType"` //共创合约承接对象,1员工,2共创用户,3公开 | ||
| 48 | + Department struct { | ||
| 49 | + DepartmentNumber string `json:"departmentNumber"` | ||
| 50 | + DepartmentId int `json:"departmentId,string,"` | ||
| 51 | + DepartmentName string `json:"departmentName"` | ||
| 52 | + } `json:"department"` //项目发起部门 | ||
| 53 | + Status int `json:"status"` // 共创项目状态,1招标中,2结束 | ||
| 54 | + | ||
| 55 | +} | ||
| 56 | + | ||
| 57 | +func ToCooperationProjectInfo(param *allied_creation_cooperation.CooperationProject) *CooperationProjectInfo { | ||
| 58 | + data := CooperationProjectInfo{ | ||
| 59 | + Company: param.Company, | ||
| 60 | + Org: param.Org, | ||
| 61 | + CooperationMode: param.CooperationMode, | ||
| 62 | + CooperationProjectDescription: param.CooperationProjectDescription, | ||
| 63 | + Attachment: param.Attachment, | ||
| 64 | + CooperationProjectId: param.CooperationProjectId, | ||
| 65 | + CooperationProjectName: param.CooperationProjectName, | ||
| 66 | + CooperationProjectNumber: param.CooperationProjectNumber, | ||
| 67 | + CooperationProjectPublishTime: param.CooperationProjectPublishTime, | ||
| 68 | + CreatedAt: param.CreatedAt, | ||
| 69 | + CooperationProjectUndertakerType: param.CooperationProjectUndertakerType, | ||
| 70 | + Department: param.Department, | ||
| 71 | + Status: param.Status, | ||
| 72 | + } | ||
| 73 | + data.CooperationProjectSponsor.UsersCode = param.CooperationProjectSponsor.UserInfo.UsersCode | ||
| 74 | + data.CooperationProjectSponsor.UsersName = param.CooperationProjectSponsor.UserInfo.UsersName | ||
| 75 | + data.CooperationProjectSponsor.UsersId = param.CooperationProjectSponsor.UsersId | ||
| 76 | + data.CooperationProjectSponsor.UserInfo = param.CooperationProjectSponsor.UserInfo | ||
| 77 | + return &data | ||
| 78 | +} | ||
| 79 | + | ||
| 80 | +type CooperationApplication struct { | ||
| 81 | + CooperationApplicationApplicant struct { | ||
| 82 | + Company struct { | ||
| 83 | + CompanyID int `json:"companyId"` | ||
| 84 | + CompanyLogo string `json:"companyLogo"` | ||
| 85 | + CompanyName string `json:"companyName"` | ||
| 86 | + } `json:"company"` | ||
| 87 | + Department struct { | ||
| 88 | + DepartmentID int `json:"departmentId"` | ||
| 89 | + DepartmentName string `json:"departmentName"` | ||
| 90 | + DepartmentNumber string `json:"departmentNumber"` | ||
| 91 | + } `json:"department"` | ||
| 92 | + Org struct { | ||
| 93 | + OrgID int `json:"orgId"` | ||
| 94 | + OrgName string `json:"orgName"` | ||
| 95 | + } `json:"org"` | ||
| 96 | + UserBaseID int `json:"userBaseId"` | ||
| 97 | + UserID int `json:"userId"` | ||
| 98 | + UserInfo struct { | ||
| 99 | + UserAccount string `json:"userAccount"` | ||
| 100 | + UserAvatar string `json:"userAvatar"` | ||
| 101 | + UserEmail string `json:"userEmail"` | ||
| 102 | + UserName string `json:"userName"` | ||
| 103 | + UserPhone string `json:"userPhone"` | ||
| 104 | + } `json:"userInfo"` | ||
| 105 | + UserType int `json:"userType"` | ||
| 106 | + } `json:"cooperationApplicationApplicant"` //申请人 | ||
| 107 | + CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述 | ||
| 108 | + CooperationApplicationID int `json:"cooperationApplicationId"` //申请id | ||
| 109 | + CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //状态 | ||
| 110 | + CooperationApplyTime int `json:"cooperationApplyTime"` //申请时间 | ||
| 111 | + CooperationApplicationAttachment []struct { | ||
| 112 | + FileSize float64 `json:"fileSize"` | ||
| 113 | + FileType string `json:"fileType"` | ||
| 114 | + Name string `json:"name"` | ||
| 115 | + URL string `json:"url"` | ||
| 116 | + } `json:"cooperationApplicationAttachment"` //附件 | ||
| 117 | +} | ||
| 118 | + | ||
| 119 | +func ToCooperationApplication(param *allied_creation_cooperation.CooperationApplication) *CooperationApplication { | ||
| 120 | + data := CooperationApplication{ | ||
| 121 | + CooperationApplicationApplicant: param.CooperationApplicationApplicant, | ||
| 122 | + CooperationApplicationDescription: param.CooperationApplicationDescription, | ||
| 123 | + CooperationApplicationID: param.CooperationApplicationID, | ||
| 124 | + CooperationApplicationStatus: param.CooperationApplicationStatus, | ||
| 125 | + CooperationApplyTime: int(param.CooperationApplyTime.Unix()), | ||
| 126 | + CooperationApplicationAttachment: param.CooperationApplicationAttachment, | ||
| 127 | + } | ||
| 128 | + return &data | ||
| 129 | +} |
| @@ -5,6 +5,7 @@ import ( | @@ -5,6 +5,7 @@ import ( | ||
| 5 | 5 | ||
| 6 | "github.com/linmadan/egglib-go/core/application" | 6 | "github.com/linmadan/egglib-go/core/application" |
| 7 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/cooperationProject/command" | 7 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/cooperationProject/command" |
| 8 | + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/cooperationProject/dto" | ||
| 8 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/cooperationProject/query" | 9 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/web/cooperationProject/query" |
| 9 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation" | 10 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation" |
| 10 | ) | 11 | ) |
| @@ -57,13 +58,32 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec | @@ -57,13 +58,32 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec | ||
| 57 | return nil, application.ThrowError(application.ARG_ERROR, err.Error()) | 58 | return nil, application.ThrowError(application.ARG_ERROR, err.Error()) |
| 58 | } | 59 | } |
| 59 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationProjectQuery.Operator) | 60 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getCooperationProjectQuery.Operator) |
| 60 | - result, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{ | 61 | + resultProject, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{ |
| 61 | CooperationProjectId: getCooperationProjectQuery.CooperationProjectId, | 62 | CooperationProjectId: getCooperationProjectQuery.CooperationProjectId, |
| 62 | }) | 63 | }) |
| 63 | if err != nil { | 64 | if err != nil { |
| 64 | return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 65 | return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
| 65 | } | 66 | } |
| 66 | - return result, nil | 67 | + resultApplication, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{ |
| 68 | + CooperationProjectNumber: resultProject.CooperationProject.CooperationProjectNumber, | ||
| 69 | + PageNumber: 0, | ||
| 70 | + PageSize: 0, | ||
| 71 | + }) | ||
| 72 | + if err != nil { | ||
| 73 | + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | ||
| 74 | + } | ||
| 75 | + var ( | ||
| 76 | + applications []dto.CooperationApplication | ||
| 77 | + ) | ||
| 78 | + for i := range resultApplication.Gride.List { | ||
| 79 | + item := dto.ToCooperationApplication(&resultApplication.Gride.List[i]) | ||
| 80 | + applications = append(applications, *item) | ||
| 81 | + } | ||
| 82 | + data := map[string]interface{}{ | ||
| 83 | + "cooperationProject": dto.ToCooperationProjectInfo(&resultProject.CooperationProject), | ||
| 84 | + "application": applications, | ||
| 85 | + } | ||
| 86 | + return data, nil | ||
| 67 | } | 87 | } |
| 68 | 88 | ||
| 69 | // 返回共创项目管理列表 | 89 | // 返回共创项目管理列表 |
| @@ -83,7 +103,15 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje | @@ -83,7 +103,15 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje | ||
| 83 | if err != nil { | 103 | if err != nil { |
| 84 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 104 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
| 85 | } | 105 | } |
| 86 | - return result.Total, result.CooperationProjects, nil | 106 | + |
| 107 | + var ( | ||
| 108 | + dataList = []dto.CooperationProjectInfo{} | ||
| 109 | + ) | ||
| 110 | + for i := range result.List { | ||
| 111 | + item := dto.ToCooperationProjectInfo(&result.List[i]) | ||
| 112 | + dataList = append(dataList, *item) | ||
| 113 | + } | ||
| 114 | + return result.Total, dataList, nil | ||
| 87 | } | 115 | } |
| 88 | 116 | ||
| 89 | // 更新共创项目管理 | 117 | // 更新共创项目管理 |
| @@ -41,31 +41,31 @@ func (gateway HttplibAlliedCreationCooperation) CooperationApplicationUpdaet(par | @@ -41,31 +41,31 @@ func (gateway HttplibAlliedCreationCooperation) CooperationApplicationUpdaet(par | ||
| 41 | return &data, err | 41 | return &data, err |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | -// CooperationApplicationsBatchApproval 共创申请一键审核 | 44 | +// CooperationApplicationsBatchApproval 共创申请批量审核 |
| 45 | func (gateway HttplibAlliedCreationCooperation) CooperationApplicationsBatchApproval(param ReqCooperationApplicationBatchApproval) (*DataCooperationApplicationBatchApproval, error) { | 45 | func (gateway HttplibAlliedCreationCooperation) CooperationApplicationsBatchApproval(param ReqCooperationApplicationBatchApproval) (*DataCooperationApplicationBatchApproval, error) { |
| 46 | url := gateway.baseUrL + "/cooperation-applications/batch-approval" | 46 | url := gateway.baseUrL + "/cooperation-applications/batch-approval" |
| 47 | method := "POST" | 47 | method := "POST" |
| 48 | req := gateway.CreateRequest(url, method) | 48 | req := gateway.CreateRequest(url, method) |
| 49 | - log.Logger.Debug("向业务模块请求数据:共创申请一键审核。", map[string]interface{}{ | 49 | + log.Logger.Debug("向业务模块请求数据:共创申请批量审核。", map[string]interface{}{ |
| 50 | "api": method + ":" + url, | 50 | "api": method + ":" + url, |
| 51 | "param": param, | 51 | "param": param, |
| 52 | }) | 52 | }) |
| 53 | req, err := req.JSONBody(param) | 53 | req, err := req.JSONBody(param) |
| 54 | if err != nil { | 54 | if err != nil { |
| 55 | - return nil, fmt.Errorf("请求共创申请一键审核失败:%w", err) | 55 | + return nil, fmt.Errorf("请求共创申请批量审核失败:%w", err) |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | byteResult, err := req.Bytes() | 58 | byteResult, err := req.Bytes() |
| 59 | if err != nil { | 59 | if err != nil { |
| 60 | - return nil, fmt.Errorf("获取共创申请一键审核失败:%w", err) | 60 | + return nil, fmt.Errorf("获取共创申请批量审核失败:%w", err) |
| 61 | } | 61 | } |
| 62 | - log.Logger.Debug("获取业务模块请求数据:共创申请一键审核。", map[string]interface{}{ | 62 | + log.Logger.Debug("获取业务模块请求数据:共创申请批量审核。", map[string]interface{}{ |
| 63 | "result": string(byteResult), | 63 | "result": string(byteResult), |
| 64 | }) | 64 | }) |
| 65 | var result service_gateway.GatewayResponse | 65 | var result service_gateway.GatewayResponse |
| 66 | err = json.Unmarshal(byteResult, &result) | 66 | err = json.Unmarshal(byteResult, &result) |
| 67 | if err != nil { | 67 | if err != nil { |
| 68 | - return nil, fmt.Errorf("解析共创申请一键审核:%w", err) | 68 | + return nil, fmt.Errorf("解析共创申请批量审核:%w", err) |
| 69 | } | 69 | } |
| 70 | var data DataCooperationApplicationBatchApproval | 70 | var data DataCooperationApplicationBatchApproval |
| 71 | err = gateway.GetResponseData(result, &data) | 71 | err = gateway.GetResponseData(result, &data) |
| @@ -350,3 +350,34 @@ func (gateway HttplibAlliedCreationCooperation) CooperationApplicationGet(param | @@ -350,3 +350,34 @@ func (gateway HttplibAlliedCreationCooperation) CooperationApplicationGet(param | ||
| 350 | err = gateway.GetResponseData(result, &data) | 350 | err = gateway.GetResponseData(result, &data) |
| 351 | return &data, err | 351 | return &data, err |
| 352 | } | 352 | } |
| 353 | + | ||
| 354 | +// CooperationApplicationsBatchApproval 共创申请一键审核 | ||
| 355 | +func (gateway HttplibAlliedCreationCooperation) CooperationApplicationsOneclickApproval(param ReqCooperationApplicationOneclickApproval) (*DataCooperationApplicationOneclickApproval, error) { | ||
| 356 | + url := gateway.baseUrL + "/cooperation-applications/oneclick-approval" | ||
| 357 | + method := "POST" | ||
| 358 | + req := gateway.CreateRequest(url, method) | ||
| 359 | + log.Logger.Debug("向业务模块请求数据:共创申请批量审核。", map[string]interface{}{ | ||
| 360 | + "api": method + ":" + url, | ||
| 361 | + "param": param, | ||
| 362 | + }) | ||
| 363 | + req, err := req.JSONBody(param) | ||
| 364 | + if err != nil { | ||
| 365 | + return nil, fmt.Errorf("请求共创申请批量审核失败:%w", err) | ||
| 366 | + } | ||
| 367 | + | ||
| 368 | + byteResult, err := req.Bytes() | ||
| 369 | + if err != nil { | ||
| 370 | + return nil, fmt.Errorf("获取共创申请批量审核失败:%w", err) | ||
| 371 | + } | ||
| 372 | + log.Logger.Debug("获取业务模块请求数据:共创申请批量审核。", map[string]interface{}{ | ||
| 373 | + "result": string(byteResult), | ||
| 374 | + }) | ||
| 375 | + var result service_gateway.GatewayResponse | ||
| 376 | + err = json.Unmarshal(byteResult, &result) | ||
| 377 | + if err != nil { | ||
| 378 | + return nil, fmt.Errorf("解析共创申请批量审核:%w", err) | ||
| 379 | + } | ||
| 380 | + var data DataCooperationApplicationOneclickApproval | ||
| 381 | + err = gateway.GetResponseData(result, &data) | ||
| 382 | + return &data, err | ||
| 383 | +} |
| @@ -195,3 +195,34 @@ func (gateway HttplibAlliedCreationCooperation) CooperationModesSearch(param Req | @@ -195,3 +195,34 @@ func (gateway HttplibAlliedCreationCooperation) CooperationModesSearch(param Req | ||
| 195 | err = gateway.GetResponseData(result, &data) | 195 | err = gateway.GetResponseData(result, &data) |
| 196 | return &data, err | 196 | return &data, err |
| 197 | } | 197 | } |
| 198 | + | ||
| 199 | +//CooperationModeBatchRemove 批量移除共创模式 | ||
| 200 | +func (gateway HttplibAlliedCreationCooperation) CooperationModeBatchRemove(param ReqCooperationModeBatchRemove) (*DataCooperationModeBatchRemove, error) { | ||
| 201 | + url := gateway.baseUrL + "/cooperation-modes/batch-remove" | ||
| 202 | + method := "post" | ||
| 203 | + req := gateway.CreateRequest(url, method) | ||
| 204 | + log.Logger.Debug("向业务模块请求数据:移除共创模式。", map[string]interface{}{ | ||
| 205 | + "api": method + ":" + url, | ||
| 206 | + "param": param, | ||
| 207 | + }) | ||
| 208 | + req, err := req.JSONBody(param) | ||
| 209 | + if err != nil { | ||
| 210 | + return nil, fmt.Errorf("请求移除共创模式失败:%w", err) | ||
| 211 | + } | ||
| 212 | + | ||
| 213 | + byteResult, err := req.Bytes() | ||
| 214 | + if err != nil { | ||
| 215 | + return nil, fmt.Errorf("获取移除共创模式失败:%w", err) | ||
| 216 | + } | ||
| 217 | + log.Logger.Debug("获取业务模块请求数据:移除共创模式。", map[string]interface{}{ | ||
| 218 | + "result": string(byteResult), | ||
| 219 | + }) | ||
| 220 | + var result service_gateway.GatewayResponse | ||
| 221 | + err = json.Unmarshal(byteResult, &result) | ||
| 222 | + if err != nil { | ||
| 223 | + return nil, fmt.Errorf("解析移除共创模式:%w", err) | ||
| 224 | + } | ||
| 225 | + var data DataCooperationModeBatchRemove | ||
| 226 | + err = gateway.GetResponseData(result, &data) | ||
| 227 | + return &data, err | ||
| 228 | +} |
| @@ -7,6 +7,145 @@ import ( | @@ -7,6 +7,145 @@ import ( | ||
| 7 | ) | 7 | ) |
| 8 | 8 | ||
| 9 | //共创实体 | 9 | //共创实体 |
| 10 | +type CooperationApplication struct { | ||
| 11 | + Company struct { | ||
| 12 | + CompanyID int `json:"companyId"` | ||
| 13 | + CompanyLogo string `json:"companyLogo"` | ||
| 14 | + CompanyName string `json:"companyName"` | ||
| 15 | + } `json:"company"` | ||
| 16 | + CooperationApplicationApplicant struct { | ||
| 17 | + Company struct { | ||
| 18 | + CompanyID int `json:"companyId"` | ||
| 19 | + CompanyLogo string `json:"companyLogo"` | ||
| 20 | + CompanyName string `json:"companyName"` | ||
| 21 | + } `json:"company"` | ||
| 22 | + Department struct { | ||
| 23 | + DepartmentID int `json:"departmentId"` | ||
| 24 | + DepartmentName string `json:"departmentName"` | ||
| 25 | + DepartmentNumber string `json:"departmentNumber"` | ||
| 26 | + } `json:"department"` | ||
| 27 | + Org struct { | ||
| 28 | + OrgID int `json:"orgId"` | ||
| 29 | + OrgName string `json:"orgName"` | ||
| 30 | + } `json:"org"` | ||
| 31 | + UserBaseID int `json:"userBaseId"` | ||
| 32 | + UserID int `json:"userId"` | ||
| 33 | + UserInfo struct { | ||
| 34 | + UserAccount string `json:"userAccount"` | ||
| 35 | + UserAvatar string `json:"userAvatar"` | ||
| 36 | + UserEmail string `json:"userEmail"` | ||
| 37 | + UserName string `json:"userName"` | ||
| 38 | + UserPhone string `json:"userPhone"` | ||
| 39 | + } `json:"userInfo"` | ||
| 40 | + UserType int `json:"userType"` | ||
| 41 | + } `json:"cooperationApplicationApplicant"` | ||
| 42 | + CooperationApplicationAttachment []struct { | ||
| 43 | + FileSize float64 `json:"fileSize"` | ||
| 44 | + FileType string `json:"fileType"` | ||
| 45 | + Name string `json:"name"` | ||
| 46 | + URL string `json:"url"` | ||
| 47 | + } `json:"cooperationApplicationAttachment"` | ||
| 48 | + CooperationApplicationDescription string `json:"cooperationApplicationDescription"` | ||
| 49 | + CooperationApplicationID int `json:"cooperationApplicationId"` | ||
| 50 | + CooperationApplicationStatus int `json:"cooperationApplicationStatus"` | ||
| 51 | + CooperationApplicationVerifier struct { | ||
| 52 | + Company struct { | ||
| 53 | + CompanyID int `json:"companyId"` | ||
| 54 | + CompanyLogo string `json:"companyLogo"` | ||
| 55 | + CompanyName string `json:"companyName"` | ||
| 56 | + } `json:"company"` | ||
| 57 | + Department struct { | ||
| 58 | + DepartmentID int `json:"departmentId"` | ||
| 59 | + DepartmentName string `json:"departmentName"` | ||
| 60 | + DepartmentNumber string `json:"departmentNumber"` | ||
| 61 | + IsOrganization bool `json:"isOrganization"` | ||
| 62 | + } `json:"department"` | ||
| 63 | + Org struct { | ||
| 64 | + Company struct { | ||
| 65 | + CompanyID int `json:"companyId"` | ||
| 66 | + CompanyLogo string `json:"companyLogo"` | ||
| 67 | + CompanyName string `json:"companyName"` | ||
| 68 | + } `json:"company"` | ||
| 69 | + OrgID int `json:"orgId"` | ||
| 70 | + OrgName string `json:"orgName"` | ||
| 71 | + } `json:"org"` | ||
| 72 | + UserBaseID int `json:"userBaseId"` | ||
| 73 | + UserID int `json:"userId"` | ||
| 74 | + UserInfo struct { | ||
| 75 | + UserAccount string `json:"userAccount"` | ||
| 76 | + UserAvatar string `json:"userAvatar"` | ||
| 77 | + UserEmail string `json:"userEmail"` | ||
| 78 | + UserName string `json:"userName"` | ||
| 79 | + UserPhone string `json:"userPhone"` | ||
| 80 | + } `json:"userInfo"` | ||
| 81 | + UserType int `json:"userType"` | ||
| 82 | + } `json:"cooperationApplicationVerifier"` | ||
| 83 | + CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` | ||
| 84 | + CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` | ||
| 85 | + CooperationApplyTime time.Time `json:"cooperationApplyTime"` | ||
| 86 | + CooperationProject struct { | ||
| 87 | + Company struct { | ||
| 88 | + CompanyID int `json:"companyId"` | ||
| 89 | + CompanyLogo string `json:"companyLogo"` | ||
| 90 | + CompanyName string `json:"companyName"` | ||
| 91 | + } `json:"company"` | ||
| 92 | + CooperationProjectDescription string `json:"cooperationProjectDescription"` | ||
| 93 | + CooperationProjectID int `json:"cooperationProjectId"` | ||
| 94 | + CooperationProjectName string `json:"cooperationProjectName"` | ||
| 95 | + CooperationProjectNumber string `json:"cooperationProjectNumber"` | ||
| 96 | + CooperationProjectPublishTime string `json:"cooperationProjectPublishTime"` | ||
| 97 | + CooperationProjectSponsor struct { | ||
| 98 | + Company struct { | ||
| 99 | + CompanyID int `json:"companyId"` | ||
| 100 | + CompanyLogo string `json:"companyLogo"` | ||
| 101 | + CompanyName string `json:"companyName"` | ||
| 102 | + } `json:"company"` | ||
| 103 | + Department struct { | ||
| 104 | + DepartmentID int `json:"departmentId"` | ||
| 105 | + DepartmentName string `json:"departmentName"` | ||
| 106 | + DepartmentNumber string `json:"departmentNumber"` | ||
| 107 | + IsOrganization bool `json:"isOrganization"` | ||
| 108 | + } `json:"department"` | ||
| 109 | + Org struct { | ||
| 110 | + Company struct { | ||
| 111 | + CompanyID int `json:"companyId"` | ||
| 112 | + CompanyLogo string `json:"companyLogo"` | ||
| 113 | + CompanyName string `json:"companyName"` | ||
| 114 | + } `json:"company"` | ||
| 115 | + OrgID int `json:"orgId"` | ||
| 116 | + OrgName string `json:"orgName"` | ||
| 117 | + } `json:"org"` | ||
| 118 | + Status int `json:"status"` | ||
| 119 | + UserBaseID int `json:"userBaseId"` | ||
| 120 | + UserID int `json:"userId"` | ||
| 121 | + UserInfo struct { | ||
| 122 | + UserAccount string `json:"userAccount"` | ||
| 123 | + UserAvatar string `json:"userAvatar"` | ||
| 124 | + UserEmail string `json:"userEmail"` | ||
| 125 | + UserName string `json:"userName"` | ||
| 126 | + UserPhone string `json:"userPhone"` | ||
| 127 | + } `json:"userInfo"` | ||
| 128 | + UserType int `json:"userType"` | ||
| 129 | + } `json:"cooperationProjectSponsor"` | ||
| 130 | + CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerType"` | ||
| 131 | + CreatedAt string `json:"createdAt"` | ||
| 132 | + DeletedAt string `json:"deletedAt"` | ||
| 133 | + OperateTime string `json:"operateTime"` | ||
| 134 | + Org struct { | ||
| 135 | + OrgID int `json:"orgId"` | ||
| 136 | + OrgName string `json:"orgName"` | ||
| 137 | + } `json:"org"` | ||
| 138 | + Status int `json:"status"` | ||
| 139 | + UpdatedAt string `json:"updatedAt"` | ||
| 140 | + } `json:"cooperationProject"` | ||
| 141 | + CreatedAt string `json:"createdAt"` | ||
| 142 | + Org struct { | ||
| 143 | + OrgID int `json:"orgId"` | ||
| 144 | + OrgName string `json:"orgName"` | ||
| 145 | + } `json:"org"` | ||
| 146 | + IsCanceled bool `json:"isCanceled"` | ||
| 147 | + UpdatedAt string `json:"updatedAt"` | ||
| 148 | +} | ||
| 10 | 149 | ||
| 11 | //更新共创申请 | 150 | //更新共创申请 |
| 12 | type ( | 151 | type ( |
| @@ -18,9 +157,12 @@ type ( | @@ -18,9 +157,12 @@ type ( | ||
| 18 | } | 157 | } |
| 19 | ) | 158 | ) |
| 20 | 159 | ||
| 21 | -//共创申请一键审核 | 160 | +//共创申请批量审核 |
| 22 | type ( | 161 | type ( |
| 23 | ReqCooperationApplicationBatchApproval struct { | 162 | ReqCooperationApplicationBatchApproval struct { |
| 163 | + CooperationApplicationIds []string `json:"cooperationApplicationIds"` | ||
| 164 | + CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述 | ||
| 165 | + Action int `json:"action"` //审核动作,1同意,2拒绝 | ||
| 24 | } | 166 | } |
| 25 | 167 | ||
| 26 | DataCooperationApplicationBatchApproval struct { | 168 | DataCooperationApplicationBatchApproval struct { |
| @@ -30,7 +172,7 @@ type ( | @@ -30,7 +172,7 @@ type ( | ||
| 30 | //取消共创申请 | 172 | //取消共创申请 |
| 31 | type ( | 173 | type ( |
| 32 | ReqCooperationApplicationCancel struct { | 174 | ReqCooperationApplicationCancel struct { |
| 33 | - ApplicationId int | 175 | + ApplicationId int `json:"applicationId"` |
| 34 | } | 176 | } |
| 35 | 177 | ||
| 36 | DataCooperationApplicationCancel struct { | 178 | DataCooperationApplicationCancel struct { |
| @@ -40,7 +182,7 @@ type ( | @@ -40,7 +182,7 @@ type ( | ||
| 40 | //审核-同意共创申请 | 182 | //审核-同意共创申请 |
| 41 | type ( | 183 | type ( |
| 42 | ReqCooperationApplicationAgree struct { | 184 | ReqCooperationApplicationAgree struct { |
| 43 | - CooperationApplicationId []int `json:"cooperationApplicationId"` | 185 | + CooperationApplicationId int `json:"cooperationApplicationId"` |
| 44 | CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` | 186 | CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` |
| 45 | } | 187 | } |
| 46 | 188 | ||
| @@ -51,7 +193,7 @@ type ( | @@ -51,7 +193,7 @@ type ( | ||
| 51 | //审核-拒绝共创申请 | 193 | //审核-拒绝共创申请 |
| 52 | type ( | 194 | type ( |
| 53 | ReqCooperationApplicationReject struct { | 195 | ReqCooperationApplicationReject struct { |
| 54 | - CooperationApplicationId []int `json:"cooperationApplicationId"` | 196 | + CooperationApplicationId int `json:"cooperationApplicationId"` |
| 55 | CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` | 197 | CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` |
| 56 | } | 198 | } |
| 57 | 199 | ||
| @@ -83,72 +225,16 @@ type ( | @@ -83,72 +225,16 @@ type ( | ||
| 83 | ApplicantName string `json:"applicantName"` //申请人姓名 | 225 | ApplicantName string `json:"applicantName"` //申请人姓名 |
| 84 | CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //共创申请审核状态,1待审核,2已同意,3已拒绝 | 226 | CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //共创申请审核状态,1待审核,2已同意,3已拒绝 |
| 85 | CooperationProjectName string `json:"cooperationProjectName"` //共创项目名称 | 227 | CooperationProjectName string `json:"cooperationProjectName"` //共创项目名称 |
| 228 | + CooperationProjectNumber string `json:"cooperationProjectNumber"` //共创项目编号 | ||
| 86 | PageNumber int `json:"pageNumber"` | 229 | PageNumber int `json:"pageNumber"` |
| 87 | PageSize int `json:"pageSize"` | 230 | PageSize int `json:"pageSize"` |
| 88 | } | 231 | } |
| 89 | 232 | ||
| 90 | DataCooperationApplicationSearch struct { | 233 | DataCooperationApplicationSearch struct { |
| 91 | Gride struct { | 234 | Gride struct { |
| 92 | - Total int | ||
| 93 | - List []struct { | ||
| 94 | - //公司 | ||
| 95 | - Company struct { | ||
| 96 | - CompanyID int `json:"companyId"` | ||
| 97 | - CompanyName string `json:"companyName"` | ||
| 98 | - } `json:"company"` | ||
| 99 | - //申请人 | ||
| 100 | - CooperationApplicationApplicant struct { | ||
| 101 | - //申请人部门 | ||
| 102 | - Department struct { | ||
| 103 | - DepartmentID int `json:"departmentId"` | ||
| 104 | - DepartmentName string `json:"departmentName"` | ||
| 105 | - DepartmentNumber string `json:"departmentNumber"` | ||
| 106 | - } `json:"department"` | ||
| 107 | - //申请人组织 | ||
| 108 | - Org struct { | ||
| 109 | - OrgID int `json:"orgId"` | ||
| 110 | - OrgName string `json:"orgName"` | ||
| 111 | - } `json:"org"` | ||
| 112 | - UserBaseID int `json:"userBaseId"` | ||
| 113 | - UserID int `json:"userId"` | ||
| 114 | - UserInfo struct { | ||
| 115 | - UserAccount string `json:"userAccount"` | ||
| 116 | - UserAvatar string `json:"userAvatar"` | ||
| 117 | - UserEmail string `json:"userEmail"` | ||
| 118 | - UserName string `json:"userName"` | ||
| 119 | - UserPhone string `json:"userPhone"` | ||
| 120 | - } `json:"userInfo"` | ||
| 121 | - UserType int `json:"userType"` | ||
| 122 | - } `json:"cooperationApplicationApplicant"` | ||
| 123 | - //附件信息 | ||
| 124 | - CooperationApplicationAttachment []struct { | ||
| 125 | - FileSize int `json:"fileSize"` | ||
| 126 | - FileType string `json:"fileType"` | ||
| 127 | - Name string `json:"name"` | ||
| 128 | - URL string `json:"url"` | ||
| 129 | - } `json:"cooperationApplicationAttachment"` | ||
| 130 | - //申请描述 | ||
| 131 | - CooperationApplicationDescription string `json:"cooperationApplicationDescription"` | ||
| 132 | - //id | ||
| 133 | - CooperationApplicationID int `json:"cooperationApplicationId"` | ||
| 134 | - //申请单状态 ,共创申请审核状态,1待审核,2已同意,3已拒绝 | ||
| 135 | - CooperationApplicationStatus int `json:"cooperationApplicationStatus"` | ||
| 136 | - //是否已取消 | ||
| 137 | - IsCanceled bool `json:"isCanceled"` | ||
| 138 | - //描述 | ||
| 139 | - CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` | ||
| 140 | - //审核时间 | ||
| 141 | - CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` | ||
| 142 | - //申请时间 | ||
| 143 | - CooperationApplyTime time.Time `json:"cooperationApplyTime"` | ||
| 144 | - Org struct { | ||
| 145 | - OrgID int `json:"orgId"` | ||
| 146 | - OrgName string `json:"orgName"` | ||
| 147 | - } `json:"org"` | ||
| 148 | - UpdatedAt time.Time `json:"updatedAt"` | ||
| 149 | - CreatedAt time.Time `json:"createdAt"` | ||
| 150 | - } `json:"list"` | ||
| 151 | - } | 235 | + Total int `json:"total"` |
| 236 | + List []CooperationApplication `json:"list"` | ||
| 237 | + } `json:"gride"` | ||
| 152 | } | 238 | } |
| 153 | ) | 239 | ) |
| 154 | 240 | ||
| @@ -187,135 +273,17 @@ type ( | @@ -187,135 +273,17 @@ type ( | ||
| 187 | } | 273 | } |
| 188 | 274 | ||
| 189 | DataCooperationApplicationGet struct { | 275 | DataCooperationApplicationGet struct { |
| 190 | - Company struct { | ||
| 191 | - CompanyID float64 `json:"companyId"` | ||
| 192 | - CompanyLogo string `json:"companyLogo"` | ||
| 193 | - CompanyName string `json:"companyName"` | ||
| 194 | - } `json:"company"` | ||
| 195 | - //申请人 | ||
| 196 | - CooperationApplicationApplicant struct { | ||
| 197 | - Department struct { | ||
| 198 | - DepartmentID float64 `json:"departmentId"` | ||
| 199 | - DepartmentName string `json:"departmentName"` | ||
| 200 | - DepartmentNumber string `json:"departmentNumber"` | ||
| 201 | - IsOrganization bool `json:"isOrganization"` | ||
| 202 | - } `json:"department"` | ||
| 203 | - Org struct { | ||
| 204 | - OrgID int `json:"orgId"` | ||
| 205 | - OrgName string `json:"orgName"` | ||
| 206 | - } `json:"org"` | ||
| 207 | - UserBaseID int `json:"userBaseId"` | ||
| 208 | - UserID int `json:"userId"` | ||
| 209 | - UserInfo struct { | ||
| 210 | - UserAccount string `json:"userAccount"` | ||
| 211 | - UserAvatar string `json:"userAvatar"` | ||
| 212 | - UserEmail string `json:"userEmail"` | ||
| 213 | - UserName string `json:"userName"` | ||
| 214 | - UserPhone string `json:"userPhone"` | ||
| 215 | - } `json:"userInfo"` | ||
| 216 | - UserType float64 `json:"userType"` | ||
| 217 | - } `json:"cooperationApplicationApplicant"` | ||
| 218 | - //附件 | ||
| 219 | - CooperationApplicationAttachment []struct { | ||
| 220 | - FileSize float64 `json:"fileSize"` | ||
| 221 | - FileType string `json:"fileType"` | ||
| 222 | - Name string `json:"name"` | ||
| 223 | - URL string `json:"url"` | ||
| 224 | - } `json:"cooperationApplicationAttachment"` | ||
| 225 | - CooperationApplicationDescription string `json:"cooperationApplicationDescription"` | ||
| 226 | - CooperationApplicationID float64 `json:"cooperationApplicationId"` | ||
| 227 | - CooperationApplicationStatus float64 `json:"cooperationApplicationStatus"` | ||
| 228 | - //审核人 | ||
| 229 | - CooperationApplicationVerifier struct { | ||
| 230 | - Department struct { | ||
| 231 | - DepartmentID float64 `json:"departmentId"` | ||
| 232 | - DepartmentName string `json:"departmentName"` | ||
| 233 | - DepartmentNumber string `json:"departmentNumber"` | ||
| 234 | - IsOrganization bool `json:"isOrganization"` | ||
| 235 | - } `json:"department"` | ||
| 236 | - Org struct { | ||
| 237 | - OrgID float64 `json:"orgId"` | ||
| 238 | - OrgName string `json:"orgName"` | ||
| 239 | - } `json:"org"` | ||
| 240 | - UserBaseID float64 `json:"userBaseId"` | ||
| 241 | - UserID float64 `json:"userId"` | ||
| 242 | - UserInfo struct { | ||
| 243 | - UserAccount string `json:"userAccount"` | ||
| 244 | - UserAvatar string `json:"userAvatar"` | ||
| 245 | - UserEmail string `json:"userEmail"` | ||
| 246 | - UserName string `json:"userName"` | ||
| 247 | - UserPhone string `json:"userPhone"` | ||
| 248 | - } `json:"userInfo"` | ||
| 249 | - UserType float64 `json:"userType"` | ||
| 250 | - } `json:"cooperationApplicationVerifier"` | ||
| 251 | - CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` | ||
| 252 | - //审核时间 | ||
| 253 | - CooperationApplicationVerifyTime string `json:"cooperationApplicationVerifyTime"` | ||
| 254 | - // 共创申请时间 | ||
| 255 | - CooperationApplyTime string `json:"cooperationApplyTime"` | ||
| 256 | - CreatedAt string `json:"createdAt"` | ||
| 257 | - Org struct { | ||
| 258 | - OrgID int `json:"orgId"` | ||
| 259 | - OrgName string `json:"orgName"` | ||
| 260 | - } `json:"org"` | ||
| 261 | - UpdatedAt string `json:"updatedAt"` | ||
| 262 | - //共创项目 | ||
| 263 | - CooperationProject struct { | ||
| 264 | - CooperationProjectDescription string `json:"cooperationProjectDescription"` | ||
| 265 | - CooperationProjectID float64 `json:"cooperationProjectId"` | ||
| 266 | - CooperationProjectName string `json:"cooperationProjectName"` | ||
| 267 | - CooperationProjectNumber string `json:"cooperationProjectNumber"` | ||
| 268 | - CooperationProjectPublishTime string `json:"cooperationProjectPublishTime"` | ||
| 269 | - CooperationProjectPublisher struct { | ||
| 270 | - Department struct { | ||
| 271 | - DepartmentID float64 `json:"departmentId"` | ||
| 272 | - DepartmentName string `json:"departmentName"` | ||
| 273 | - DepartmentNumber string `json:"departmentNumber"` | ||
| 274 | - } `json:"department"` | ||
| 275 | - Org struct { | ||
| 276 | - OrgID float64 `json:"orgId"` | ||
| 277 | - OrgName string `json:"orgName"` | ||
| 278 | - } `json:"org"` | ||
| 279 | - UserBaseID float64 `json:"userBaseId"` | ||
| 280 | - UserID float64 `json:"userId"` | ||
| 281 | - UserInfo struct { | ||
| 282 | - UserAccount string `json:"userAccount"` | ||
| 283 | - UserAvatar string `json:"userAvatar"` | ||
| 284 | - UserEmail string `json:"userEmail"` | ||
| 285 | - UserName string `json:"userName"` | ||
| 286 | - UserPhone string `json:"userPhone"` | ||
| 287 | - } `json:"userInfo"` | ||
| 288 | - UserType float64 `json:"userType"` | ||
| 289 | - } `json:"cooperationProjectPublisher"` | ||
| 290 | - //项目发起人 | ||
| 291 | - CooperationProjectSponsor struct { | ||
| 292 | - Department struct { | ||
| 293 | - DepartmentID float64 `json:"departmentId"` | ||
| 294 | - DepartmentName string `json:"departmentName"` | ||
| 295 | - DepartmentNumber string `json:"departmentNumber"` | ||
| 296 | - } `json:"department"` | ||
| 297 | - Org struct { | ||
| 298 | - OrgID int `json:"orgId"` | ||
| 299 | - OrgName string `json:"orgName"` | ||
| 300 | - } `json:"org"` | ||
| 301 | - UserBaseID int `json:"userBaseId"` | ||
| 302 | - UserID int `json:"userId"` | ||
| 303 | - UserInfo struct { | ||
| 304 | - UserAccount string `json:"userAccount"` | ||
| 305 | - UserAvatar string `json:"userAvatar"` | ||
| 306 | - UserEmail string `json:"userEmail"` | ||
| 307 | - UserName string `json:"userName"` | ||
| 308 | - UserPhone string `json:"userPhone"` | ||
| 309 | - } `json:"userInfo"` | ||
| 310 | - UserType float64 `json:"userType"` | ||
| 311 | - } `json:"cooperationProjectSponsor"` | ||
| 312 | - CooperationProjectUndertakerType []float64 `json:"cooperationProjectUndertakerType"` | ||
| 313 | - CreatedAt time.Time `json:"createdAt"` | ||
| 314 | - Org struct { | ||
| 315 | - OrgID int `json:"orgId"` | ||
| 316 | - OrgName string `json:"orgName"` | ||
| 317 | - } `json:"org"` | ||
| 318 | - Status float64 `json:"status"` | ||
| 319 | - } `json:"cooperationProject"` | 276 | + CooperationApplication |
| 277 | + } | ||
| 278 | +) | ||
| 279 | + | ||
| 280 | +//共创申请一键审核 | ||
| 281 | +type ( | ||
| 282 | + ReqCooperationApplicationOneclickApproval struct { | ||
| 283 | + CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //审核描述 | ||
| 284 | + Action int `json:"action"` //审核动作,1同意,2拒绝 | ||
| 285 | + } | ||
| 286 | + | ||
| 287 | + DataCooperationApplicationOneclickApproval struct { | ||
| 320 | } | 288 | } |
| 321 | ) | 289 | ) |
| @@ -127,13 +127,23 @@ type ( | @@ -127,13 +127,23 @@ type ( | ||
| 127 | //移除共创模式 | 127 | //移除共创模式 |
| 128 | type ( | 128 | type ( |
| 129 | ReqCooperationModeRemove struct { | 129 | ReqCooperationModeRemove struct { |
| 130 | - CooperationModeId int `json:"cooperationModeId"` | 130 | + CooperationModeId int `json:"cooperationModeId,string"` |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | DataCooperationModeRemove struct { | 133 | DataCooperationModeRemove struct { |
| 134 | } | 134 | } |
| 135 | ) | 135 | ) |
| 136 | 136 | ||
| 137 | +//批量移除共创模式 | ||
| 138 | +type ( | ||
| 139 | + ReqCooperationModeBatchRemove struct { | ||
| 140 | + CooperationModeIds []string `json:"cooperationModeIds"` | ||
| 141 | + } | ||
| 142 | + | ||
| 143 | + DataCooperationModeBatchRemove struct { | ||
| 144 | + } | ||
| 145 | +) | ||
| 146 | + | ||
| 137 | //查询共创模式 | 147 | //查询共创模式 |
| 138 | type ( | 148 | type ( |
| 139 | ReqCooperationModesSearch struct { | 149 | ReqCooperationModesSearch struct { |
| @@ -53,7 +53,7 @@ type CooperationProject struct { | @@ -53,7 +53,7 @@ type CooperationProject struct { | ||
| 53 | DepartmentId int `json:"departmentId,string,"` | 53 | DepartmentId int `json:"departmentId,string,"` |
| 54 | DepartmentName string `json:"departmentName"` | 54 | DepartmentName string `json:"departmentName"` |
| 55 | } `json:"department"` //项目发起部门 | 55 | } `json:"department"` //项目发起部门 |
| 56 | - Status int `json:"status"` | 56 | + Status int `json:"status"` // 共创项目状态,1招标中,2结束 |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | //创建共创项目 | 59 | //创建共创项目 |
| @@ -118,7 +118,7 @@ type ( | @@ -118,7 +118,7 @@ type ( | ||
| 118 | //移除共创项目 | 118 | //移除共创项目 |
| 119 | type ( | 119 | type ( |
| 120 | ReqCooperationProjectRemove struct { | 120 | ReqCooperationProjectRemove struct { |
| 121 | - CooperationProjectID int | 121 | + CooperationProjectID int `json:"cooperationProjectId"` |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | DataCooperationProjectRemove struct { | 124 | DataCooperationProjectRemove struct { |
| @@ -148,8 +148,8 @@ type ( | @@ -148,8 +148,8 @@ type ( | ||
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | DataCooperationProjectSearch struct { | 150 | DataCooperationProjectSearch struct { |
| 151 | - Total int64 `json:"total"` | ||
| 152 | - CooperationProjects []CooperationProject `json:"cooperationProjects"` | 151 | + Total int64 `json:"total"` |
| 152 | + List []CooperationProject `json:"cooperationProjects"` | ||
| 153 | } | 153 | } |
| 154 | ) | 154 | ) |
| 155 | 155 |
| @@ -50,9 +50,12 @@ func (controller *CooperationModeController) GetCooperationMode() { | @@ -50,9 +50,12 @@ func (controller *CooperationModeController) GetCooperationMode() { | ||
| 50 | func (controller *CooperationModeController) RemoveCooperationMode() { | 50 | func (controller *CooperationModeController) RemoveCooperationMode() { |
| 51 | cooperationModeService := service.NewCooperationModeService(nil) | 51 | cooperationModeService := service.NewCooperationModeService(nil) |
| 52 | removeCooperationModeCommand := &command.RemoveCooperationModeCommand{} | 52 | removeCooperationModeCommand := &command.RemoveCooperationModeCommand{} |
| 53 | - modeId, _ := controller.GetInt(":modeId") | 53 | + err := controller.Unmarshal(removeCooperationModeCommand) |
| 54 | + if err != nil { | ||
| 55 | + log.Logger.Debug("json err:" + err.Error()) | ||
| 56 | + } | ||
| 54 | removeCooperationModeCommand.Operator = controller.GetOperator() | 57 | removeCooperationModeCommand.Operator = controller.GetOperator() |
| 55 | - removeCooperationModeCommand.CooperationModeId = modeId | 58 | + |
| 56 | data, err := cooperationModeService.RemoveCooperationMode(removeCooperationModeCommand) | 59 | data, err := cooperationModeService.RemoveCooperationMode(removeCooperationModeCommand) |
| 57 | controller.Response(data, err) | 60 | controller.Response(data, err) |
| 58 | } | 61 | } |
| @@ -9,6 +9,6 @@ func init() { | @@ -9,6 +9,6 @@ func init() { | ||
| 9 | web.Router("/v1/web/cooperation-modes/", &web_client.CooperationModeController{}, "Post:CreateCooperationMode") | 9 | web.Router("/v1/web/cooperation-modes/", &web_client.CooperationModeController{}, "Post:CreateCooperationMode") |
| 10 | web.Router("/v1/web/cooperation-modes/:modeId", &web_client.CooperationModeController{}, "Put:UpdateCooperationMode") | 10 | web.Router("/v1/web/cooperation-modes/:modeId", &web_client.CooperationModeController{}, "Put:UpdateCooperationMode") |
| 11 | web.Router("/v1/web/cooperation-modes/:modeId", &web_client.CooperationModeController{}, "Get:GetCooperationMode") | 11 | web.Router("/v1/web/cooperation-modes/:modeId", &web_client.CooperationModeController{}, "Get:GetCooperationMode") |
| 12 | - web.Router("/v1/web/cooperation-modes/:modeId", &web_client.CooperationModeController{}, "Delete:RemoveCooperationMode") | 12 | + web.Router("/v1/web/cooperation-modes/remove", &web_client.CooperationModeController{}, "Post:RemoveCooperationMode") |
| 13 | web.Router("/v1/web/cooperation-modes/search", &web_client.CooperationModeController{}, "Post:ListCooperationMode") | 13 | web.Router("/v1/web/cooperation-modes/search", &web_client.CooperationModeController{}, "Post:ListCooperationMode") |
| 14 | } | 14 | } |
-
请 注册 或 登录 后发表评论