共创项目状态

@@ -17,6 +17,8 @@ type ListCooperationProjectQuery struct {
 	CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
 	CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
 	// 组织机构ID
 	// 组织机构ID
 	OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
 	OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
+	// 项目状态 1招标中，2结束  0全部
+	Status int32 `json:"status"`
 	// 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
 	// 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
 	UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
 	UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
 	// 用户基础数据id
 	// 用户基础数据id

@@ -16,6 +16,7 @@ func TransformToCooperationProjectDomainModelFromPgModels(
 		CooperationProjectPublishTime: cooperationProjectModel.CooperationProjectPublishTime,
 		CooperationProjectPublishTime: cooperationProjectModel.CooperationProjectPublishTime,
 		CooperationProjectPublisher:   cooperationProjectModel.CooperationProjectPublisher,
 		CooperationProjectPublisher:   cooperationProjectModel.CooperationProjectPublisher,
 		CooperationProjectSponsor:     cooperationProjectModel.CooperationProjectSponsor,
 		CooperationProjectSponsor:     cooperationProjectModel.CooperationProjectSponsor,
+		Attachment:                    cooperationProjectModel.Attachment,
 		CooperationMode: &domain.CooperationMode{
 		CooperationMode: &domain.CooperationMode{
 			CooperationModeId:     cooperationMode.CooperationModeId,
 			CooperationModeId:     cooperationMode.CooperationModeId,
 			CooperationModeNumber: cooperationMode.CooperationModeNumber,
 			CooperationModeNumber: cooperationMode.CooperationModeNumber,

@@ -196,6 +196,9 @@ func (repository *CooperationProjectRepository) Find(queryOptions map[string]int
 	var cooperationProjectModels []*models.CooperationProject
 	var cooperationProjectModels []*models.CooperationProject
 	cooperationProjects := make([]*domain.CooperationProject, 0)
 	cooperationProjects := make([]*domain.CooperationProject, 0)
 	query := sqlbuilder.BuildQuery(tx.Model(&cooperationProjectModels), queryOptions)
 	query := sqlbuilder.BuildQuery(tx.Model(&cooperationProjectModels), queryOptions)
+	if v, ok := queryOptions["status"]; ok && v.(int32) > 0 {
+		query.Where("status =? ", v)
+	}
 	query.SetOffsetAndLimit(20)
 	query.SetOffsetAndLimit(20)
 	query.SetOrderDirect("cooperation_project_id", "DESC")
 	query.SetOrderDirect("cooperation_project_id", "DESC")
 	if count, err := query.SelectAndCount(); err != nil {
 	if count, err := query.SelectAndCount(); err != nil {

@@ -88,6 +88,7 @@ func (controller *CooperationProjectController) RemoveCooperationProject() {
 func (controller *CooperationProjectController) SearchCooperationProject() {
 func (controller *CooperationProjectController) SearchCooperationProject() {
 	cooperationProjectService := service.NewCooperationProjectService(nil)
 	cooperationProjectService := service.NewCooperationProjectService(nil)
 	searchCooperationProjectQuery := &query.SearchCooperationProjectQuery{}
 	searchCooperationProjectQuery := &query.SearchCooperationProjectQuery{}
+	controller.Unmarshal(searchCooperationProjectQuery)
 	// 解析头部信息
 	// 解析头部信息
 	header := controller.GetRequestHeader(controller.Ctx)
 	header := controller.GetRequestHeader(controller.Ctx)
 	searchCooperationProjectQuery.CompanyId = header.CompanyId
 	searchCooperationProjectQuery.CompanyId = header.CompanyId