作者 陈志颖

fix:共创项目搜索条件补充

@@ -15,6 +15,8 @@ type SearchCooperationProjectQuery struct { @@ -15,6 +15,8 @@ type SearchCooperationProjectQuery struct {
15 PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"` 15 PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 共创项目名称 16 // 共创项目名称
17 CooperationProjectName string `cname:"共创项目名称" json:"cooperationProjectName,omitempty"` 17 CooperationProjectName string `cname:"共创项目名称" json:"cooperationProjectName,omitempty"`
  18 + // 共创项目编号
  19 + CooperationProjectNumber string `cname:"共创项目编号" json:"cooperationProjectNumber,omitempty"`
18 // 部门名称 20 // 部门名称
19 DepartmentName string `cname:"部门名称" json:"departmentName,omitempty"` 21 DepartmentName string `cname:"部门名称" json:"departmentName,omitempty"`
20 // 共创项目状态,根据共创项目状态筛选项目数据 22 // 共创项目状态,根据共创项目状态筛选项目数据
@@ -243,6 +243,9 @@ func (repository *CooperationProjectRepository) Find(queryOptions map[string]int @@ -243,6 +243,9 @@ func (repository *CooperationProjectRepository) Find(queryOptions map[string]int
243 if cooperationProjectName, ok := queryOptions["cooperationProjectName"]; ok && cooperationProjectName != "" { 243 if cooperationProjectName, ok := queryOptions["cooperationProjectName"]; ok && cooperationProjectName != "" {
244 query.Where("cooperation_project_name like ?", fmt.Sprintf("%%%s%%", cooperationProjectName)) 244 query.Where("cooperation_project_name like ?", fmt.Sprintf("%%%s%%", cooperationProjectName))
245 } 245 }
  246 + if cooperationProjectNumber, ok := queryOptions["cooperationProjectNumber"]; ok && cooperationProjectNumber != "" {
  247 + query.Where("cooperation_project_number ilike ?", fmt.Sprintf("%%%s%%", cooperationProjectNumber))
  248 + }
246 if companyId, ok := queryOptions["companyId"]; ok && companyId.(int64) != 0 { 249 if companyId, ok := queryOptions["companyId"]; ok && companyId.(int64) != 0 {
247 query.Where("company->>'companyId' = '?'", companyId) 250 query.Where("company->>'companyId' = '?'", companyId)
248 } 251 }