作者 陈志颖

fix:共创项目查询增加承接人类型查询

@@ -17,6 +17,8 @@ type SearchCooperationProjectQuery struct { @@ -17,6 +17,8 @@ type SearchCooperationProjectQuery struct {
17 CooperationProjectName string `cname:"共创项目名称" json:"cooperationProjectName,omitempty"` 17 CooperationProjectName string `cname:"共创项目名称" json:"cooperationProjectName,omitempty"`
18 // 共创项目编号 18 // 共创项目编号
19 CooperationProjectNumber string `cname:"共创项目编号" json:"cooperationProjectNumber,omitempty"` 19 CooperationProjectNumber string `cname:"共创项目编号" json:"cooperationProjectNumber,omitempty"`
  20 + // 共创项目承接对象,1员工,2共创用户,4公开,可以多选
  21 + CooperationProjectUndertakerType int32 `json:"cooperationProjectUndertakerType"`
20 // 部门名称 22 // 部门名称
21 DepartmentName string `cname:"部门名称" json:"departmentName,omitempty"` 23 DepartmentName string `cname:"部门名称" json:"departmentName,omitempty"`
22 // 关键字搜索 24 // 关键字搜索
@@ -260,6 +260,9 @@ func (repository *CooperationProjectRepository) Find(queryOptions map[string]int @@ -260,6 +260,9 @@ func (repository *CooperationProjectRepository) Find(queryOptions map[string]int
260 if cooperationProjectIds, ok := queryOptions["cooperationProjectIds"]; ok && len(cooperationProjectIds.([]int64)) > 0 { 260 if cooperationProjectIds, ok := queryOptions["cooperationProjectIds"]; ok && len(cooperationProjectIds.([]int64)) > 0 {
261 query.Where("cooperation_project_id IN (?)", pg.In(cooperationProjectIds)) 261 query.Where("cooperation_project_id IN (?)", pg.In(cooperationProjectIds))
262 } 262 }
  263 + if cooperationProjectUndertakerType, ok := queryOptions["cooperationProjectUndertakerType"]; ok && cooperationProjectUndertakerType.(int32) != 0 {
  264 + query.Where(`cooperation_project.cooperation_project_undertaker_types @> '{?}'`, cooperationProjectUndertakerType)
  265 + }
263 if departmentName, ok := queryOptions["departmentName"]; ok && departmentName != "" { 266 if departmentName, ok := queryOptions["departmentName"]; ok && departmentName != "" {
264 query.Where("department->>'departmentName' like ? ", fmt.Sprintf("%%%s%%", departmentName)) 267 query.Where("department->>'departmentName' like ? ", fmt.Sprintf("%%%s%%", departmentName))
265 } 268 }