作者 yangfu

共创项目列表 全量

... ... @@ -19,7 +19,8 @@ type ListCooperationProjectQuery struct {
//发起部门名称
DepartmentName string `json:"departmentName"`
//项目名称
CooperationProjectName string `json:"cooperationProjectName"`
CooperationProjectName string `json:"cooperationProjectName"`
CooperationProjectNumberLike string `json:"cooperationProjectNumberLike"`
}
func (listCooperationProjectQuery *ListCooperationProjectQuery) Valid(validation *validation.Validation) {
... ...
... ... @@ -160,6 +160,37 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro
return updateCooperationProjectCommand, nil
}
// 返回共创项目管理列表
func (cooperationProjectService *CooperationProjectService) ListCooperationProjectSelector(listCooperationProjectQuery *query.ListCooperationProjectQuery) (int64, interface{}, error) {
listCooperationProjectQuery.PageSize = 999
if err := listCooperationProjectQuery.ValidateQuery(); err != nil {
return 0, nil, application.ThrowError(application.ARG_ERROR, err.Error())
}
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationProjectQuery.Operator)
result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
PageNumber: listCooperationProjectQuery.PageNumber,
PageSize: listCooperationProjectQuery.PageSize,
//发起部门名称
DepartmentName: listCooperationProjectQuery.DepartmentName,
//项目名
CooperationProjectName: listCooperationProjectQuery.CooperationProjectName,
CooperationProjectNumberLike: listCooperationProjectQuery.CooperationProjectNumberLike,
})
if err != nil {
return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
}
var items []interface{}
for i := range result.List {
item := result.List[i]
items = append(items, map[string]interface{}{
"cooperationProjectId": item.CooperationProjectID,
"cooperationProjectNumber": item.CooperationProjectNumber,
"cooperationProjectName": item.CooperationProjectName,
})
}
return int64(result.Total), items, nil
}
func NewCooperationProjectService(options map[string]interface{}) *CooperationProjectService {
newCooperationProjectService := &CooperationProjectService{}
return newCooperationProjectService
... ...
... ... @@ -160,7 +160,9 @@ type (
// 共创项目状态,1招标中,2结束 0 全部
Status int `json:"status"`
//
OrgIds []string `json:"orgIds"`
OrgIds []string `json:"orgIds"`
CooperationProjectNumberLike string `json:"cooperationProjectNumberLike"`
//OffsetLimitFlag bool `json:"offsetLimitFlag"`
}
DataCooperationProjectSearch struct {
... ...
... ... @@ -59,6 +59,18 @@ func (controller *CooperationProjectController) ListCooperationProject() {
controller.ReturnPageListData(cnt, data, err, listCooperationProjectQuery.PageNumber)
}
func (controller *CooperationProjectController) SelectorCooperationProject() {
cooperationProjectService := service.NewCooperationProjectService(nil)
listCooperationProjectQuery := &query.ListCooperationProjectQuery{}
err := controller.Unmarshal(listCooperationProjectQuery)
if err != nil {
log.Logger.Debug("json err:" + err.Error())
}
listCooperationProjectQuery.Operator = controller.GetOperator()
cnt, data, err := cooperationProjectService.ListCooperationProjectSelector(listCooperationProjectQuery)
controller.ReturnListData(cnt, data, err)
}
func (controller *CooperationProjectController) EndCooperationProject() {
cooperationProjectService := service.NewCooperationProjectService(nil)
endCooperationProjectCommand := &command.EndCooperationProjectCommand{}
... ...
... ... @@ -11,6 +11,7 @@ func init() {
web.Router("/v1/web/cooperation-projects/:projectId", &web_client.CooperationProjectController{}, "Get:GetCooperationProject")
web.Router("/v1/web/cooperation-projects/search", &web_client.CooperationProjectController{}, "Post:ListCooperationProject")
web.Router("/v1/web/cooperation-projects/end", &web_client.CooperationProjectController{}, "Put:EndCooperationProject")
web.Router("/v1/web/cooperation-projects/selector", &web_client.CooperationProjectController{}, "Post:SelectorCooperationProject")
/***** 1.共创模式 *****/
// web.Router("/v1/web/cooperation-modes/", &web_client.CooperationModeController{}, "Post:CreateCooperationMode")
... ...