作者 陈志颖

fix:共创项目描述关键词搜索

... ... @@ -20,7 +20,7 @@ type ApplyForCooperationCommand struct {
// 组织机构ID
OrgId int64 `cname:"组织机构ID" json:"orgId" valid:"Required"`
// 公司ID,通过集成REST上下文获取
CompanyId int64 `cname:"公司ID" json:"companyId" valid:"Required"`
CompanyId int64 `cname:"公司ID" json:"companyId"`
// 共创项目ID
CooperationProjectId int64 `cname:"共创项目ID" json:"cooperationProjectId" valid:"Required"`
}
... ...
... ... @@ -19,6 +19,8 @@ type SearchCooperationProjectQuery struct {
CooperationProjectNumber string `cname:"共创项目编号" json:"cooperationProjectNumber,omitempty"`
// 部门名称
DepartmentName string `cname:"部门名称" json:"departmentName,omitempty"`
// 关键字搜索
Keyword string `cname:"关键字" json:"keyword"`
// 共创项目状态,根据共创项目状态筛选项目数据
Status int32 `cname:"共创项目状态" json:"status,omitempty"`
// 公司ID,通过集成REST上下文获取
... ...
... ... @@ -247,6 +247,9 @@ func (repository *CooperationProjectRepository) Find(queryOptions map[string]int
if cooperationProjectNumber, ok := queryOptions["cooperationProjectNumber"]; ok && cooperationProjectNumber != "" {
query.Where("cooperation_project_number ilike ?", fmt.Sprintf("%%%s%%", cooperationProjectNumber))
}
if keyword, ok := queryOptions["keyword"]; ok && keyword != "" {
query.Where("cooperation_project_description like ?", fmt.Sprintf("%%%s%%", keyword))
}
if companyId, ok := queryOptions["companyId"]; ok && companyId.(int64) != 0 {
query.Where("company->>'companyId' = '?'", companyId)
}
... ...