更新任务列表 搜索条件

@@ -5,8 +5,9 @@ type SearchTaskCommand struct {
 	CompanyId  int    `json:"-"`
 	CompanyId  int    `json:"-"`
 	PageNumber int    `json:"pageNumber"` //分页
 	PageNumber int    `json:"pageNumber"` //分页
 	PageSize   int    `json:"pageSize"`   //分页
 	PageSize   int    `json:"pageSize"`   //分页
-	TaskName   string `json:"taskName"`   //任务名称
-	LevelName  string `json:"levelName"`  //优先级
 	OnlyMy     bool   `json:"onlyMy"`     //只查看我负责的任务
 	OnlyMy     bool   `json:"onlyMy"`     //只查看我负责的任务
-	LeaderName string `json:"leaderId"`   //任务负责人id
+	SearchWord string `json:"searchWord"`
+	// TaskName   string `json:"taskName"`   //任务名称
+	// LevelName  string `json:"levelName"`  //优先级
+	// LeaderName string `json:"leaderId"`   //任务负责人id
 }
 }

@@ -681,14 +681,13 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i
 		}
 		}
 	}
 	}
 	condition := dao.ListTaskCondition{
 	condition := dao.ListTaskCondition{
-		Limit:      limit,
-		Offset:     offset,
-		UserId:     param.UserId,
-		CompanyId:  param.CompanyId,
-		TaskName:   param.TaskName,
-		LevelName:  param.LevelName,
+		Limit:     limit,
+		Offset:    offset,
+		UserId:    param.UserId,
+		CompanyId: param.CompanyId,
+
 		OnlyMy:     param.OnlyMy,
 		OnlyMy:     param.OnlyMy,
-		LeaderName: param.LeaderName,
+		SearchWord: param.SearchWord,
 	}
 	}
 
 
 	taskDao := dao.NewTaskDao(map[string]interface{}{
 	taskDao := dao.NewTaskDao(map[string]interface{}{
@@ -785,10 +784,8 @@ func (srv TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[s
 		Offset:     offset,
 		Offset:     offset,
 		UserId:     param.UserId,
 		UserId:     param.UserId,
 		CompanyId:  param.CompanyId,
 		CompanyId:  param.CompanyId,
-		TaskName:   param.TaskName,
-		LevelName:  param.LevelName,
 		OnlyMy:     param.OnlyMy,
 		OnlyMy:     param.OnlyMy,
-		LeaderName: param.LeaderName,
+		SearchWord: param.SearchWord,
 	}
 	}
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {
@@ -1046,7 +1043,7 @@ func (srv TaskService) ConditionForListTask2(param *command.GetSelcetCommand) (m
 	}
 	}
 	var tasklistData []dao.TaskData1
 	var tasklistData []dao.TaskData1
 	if hrbpFlag == domain.RoleTypeSystem {
 	if hrbpFlag == domain.RoleTypeSystem {
-		tasklistData, err = taskDao.ListTask2ForHrbp(param.UserId)
+		tasklistData, err = taskDao.ListTask2ForHrbp(param.UserId, param.CompanyId)
 		if err != nil {
 		if err != nil {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取任务列表"+err.Error())
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取任务列表"+err.Error())
 		}
 		}

@@ -60,14 +60,12 @@ func (d *TaskDao) catchTaskIdByPermission(userId int) string {
 }
 }
 
 
 type ListTaskCondition struct {
 type ListTaskCondition struct {
-	Limit      int    //分页
-	Offset     int    //分页
-	CompanyId  int    //公司id
-	UserId     int    //谁要查看任务数据
-	TaskName   string //任务名称
-	LevelName  string //优先级
-	OnlyMy     bool   //只查看我负责的任务
-	LeaderName string //任务负责人名称
+	Limit      int  //分页
+	Offset     int  //分页
+	CompanyId  int  //公司id
+	UserId     int  //谁要查看任务数据
+	OnlyMy     bool //只查看我负责的任务
+	SearchWord string
 }
 }
 
 
 // 任务和里程碑列表
 // 任务和里程碑列表
@@ -162,17 +160,10 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
 		whereSql += ` and t_task_tage_1.leader_id = '?' `
 		whereSql += ` and t_task_tage_1.leader_id = '?' `
-	} else if param.LeaderName != "" {
-		condition = append(condition, param.LeaderName)
-		whereSql += ` and t_task_tage_1.leader_name = ? `
 	}
 	}
-	if len(param.TaskName) > 0 {
-		condition = append(condition, param.TaskName)
-		whereSql += ` and t_task_tage_1.task_name like ? `
-	}
-	if len(param.LevelName) > 0 {
-		condition = append(condition, param.LevelName)
-		whereSql += ` and t_task_tage_1.level_name like ? `
+	if param.SearchWord != "" {
+		condition = append(condition, param.SearchWord, param.SearchWord)
+		whereSql += ` and (t_task_tage_1.leader_name like ? or t_task_tage_1.task_alias_name like ?)`
 	}
 	}
 	condition = append(condition, param.Limit, param.Offset)
 	condition = append(condition, param.Limit, param.Offset)
 	sqlStr := fmt.Sprintf(withSql, whereSql)
 	sqlStr := fmt.Sprintf(withSql, whereSql)
@@ -193,18 +184,12 @@ func (d *TaskDao) CountTaskStageNotHrbp(param ListTaskCondition) (int, error) {
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
 		whereSql += ` and task.leader ->>'id' = '?' `
 		whereSql += ` and task.leader ->>'id' = '?' `
-	} else if param.LeaderName != "" {
-		condition = append(condition, param.LeaderName)
-		whereSql += ` and task.leader ->>'name' = ? `
-	}
-	if len(param.TaskName) > 0 {
-		condition = append(condition, param.TaskName)
-		whereSql += ` and task.name like ? `
 	}
 	}
-	if len(param.LevelName) > 0 {
-		condition = append(condition, param.LevelName)
-		whereSql += ` and task.level_name like ? `
+	if param.SearchWord != "" {
+		condition = append(condition, param.SearchWord, param.SearchWord)
+		whereSql += ` and (t_task_tage_1.leader_name like ? or t_task_tage_1.task_alias_name like ?)`
 	}
 	}
+
 	sqlStr := withSql + whereSql
 	sqlStr := withSql + whereSql
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
 	var cnt int
 	var cnt int
@@ -286,17 +271,10 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage,
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
 		whereSql += ` and t_task_tage_1.leader_id = '?' `
 		whereSql += ` and t_task_tage_1.leader_id = '?' `
-	} else if param.LeaderName != "" {
-		condition = append(condition, param.LeaderName)
-		whereSql += ` and t_task_tage_1.leader_name = ? `
 	}
 	}
-	if len(param.TaskName) > 0 {
-		condition = append(condition, param.TaskName)
-		whereSql += ` and t_task_tage_1.task_name like ? `
-	}
-	if len(param.LevelName) > 0 {
-		condition = append(condition, param.LevelName)
-		whereSql += ` and t_task_tage_1.level_name like ? `
+	if param.SearchWord != "" {
+		condition = append(condition, param.SearchWord, param.SearchWord)
+		whereSql += ` and (t_task_tage_1.leader_name like ? or t_task_tage_1.task_alias_name like ?)`
 	}
 	}
 	condition = append(condition, param.Limit, param.Offset)
 	condition = append(condition, param.Limit, param.Offset)
 	sqlStr := fmt.Sprintf(withSql, whereSql)
 	sqlStr := fmt.Sprintf(withSql, whereSql)
@@ -320,17 +298,10 @@ func (d *TaskDao) CountTaskStageByHrbp(param ListTaskCondition) (int, error) {
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
 		whereSql += ` and task.leader ->>'id' = '?' `
 		whereSql += ` and task.leader ->>'id' = '?' `
-	} else if param.LeaderName != "" {
-		condition = append(condition, param.LeaderName)
-		whereSql += ` and task.leader ->>'name' = ? `
-	}
-	if len(param.TaskName) > 0 {
-		condition = append(condition, param.TaskName)
-		whereSql += ` and task.name like ? `
 	}
 	}
-	if len(param.LevelName) > 0 {
-		condition = append(condition, param.LevelName)
-		whereSql += ` and task.level_name like ? `
+	if param.SearchWord != "" {
+		condition = append(condition, param.SearchWord, param.SearchWord)
+		whereSql += ` and (t_task_tage_1.leader_name like ? or t_task_tage_1.task_alias_name like ?)`
 	}
 	}
 	sqlStr := withSql + whereSql
 	sqlStr := withSql + whereSql
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
@@ -357,17 +328,10 @@ func (d *TaskDao) CountTaskStageAnomalyNotHrbp(param ListTaskCondition) (int, er
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
 		whereSql += ` and task.leader ->>'id' = '?' `
 		whereSql += ` and task.leader ->>'id' = '?' `
-	} else if param.LeaderName != "" {
-		condition = append(condition, param.LeaderName)
-		whereSql += ` and task.leader ->>'name' = ? `
-	}
-	if len(param.TaskName) > 0 {
-		condition = append(condition, param.TaskName)
-		whereSql += ` and task.name like ? `
 	}
 	}
-	if len(param.LevelName) > 0 {
-		condition = append(condition, param.LevelName)
-		whereSql += ` and task.level_name like ? `
+	if param.SearchWord != "" {
+		condition = append(condition, param.SearchWord, param.SearchWord)
+		whereSql += ` and (t_task_tage_1.leader_name like ? or t_task_tage_1.task_alias_name like ?)`
 	}
 	}
 	sqlStr := withSql + whereSql
 	sqlStr := withSql + whereSql
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
@@ -396,18 +360,12 @@ func (d *TaskDao) CountTaskStageAnomalyByHrbp(param ListTaskCondition) (int, err
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
 		whereSql += ` and task.leader ->>'id' = '?' `
 		whereSql += ` and task.leader ->>'id' = '?' `
-	} else if param.LeaderName != "" {
-		condition = append(condition, param.LeaderName)
-		whereSql += ` and task.leader ->>'name' = ? `
 	}
 	}
-	if len(param.TaskName) > 0 {
-		condition = append(condition, param.TaskName)
-		whereSql += ` and task.name like ? `
-	}
-	if len(param.LevelName) > 0 {
-		condition = append(condition, param.LevelName)
-		whereSql += ` and task.level_name like ? `
+	if param.SearchWord != "" {
+		condition = append(condition, param.SearchWord, param.SearchWord)
+		whereSql += ` and (t_task_tage_1.leader_name like ? or t_task_tage_1.task_alias_name like ?)`
 	}
 	}
+
 	sqlStr := withSql + whereSql
 	sqlStr := withSql + whereSql
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
 	var cnt int
 	var cnt int
@@ -475,17 +433,10 @@ func (d *TaskDao) CountTaskAnomalyNotHrbp(param ListTaskCondition) (int, error)
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
 		whereSql += ` and task.leader ->>'id' = '?' `
 		whereSql += ` and task.leader ->>'id' = '?' `
-	} else if param.LeaderName != "" {
-		condition = append(condition, param.LeaderName)
-		whereSql += ` and task.leader ->>'id' = ? `
-	}
-	if len(param.TaskName) > 0 {
-		condition = append(condition, param.TaskName)
-		whereSql += ` and task.name like ? `
 	}
 	}
-	if len(param.LevelName) > 0 {
-		condition = append(condition, param.LevelName)
-		whereSql += ` and task.level_name like ? `
+	if param.SearchWord != "" {
+		condition = append(condition, param.SearchWord, param.SearchWord)
+		whereSql += ` and (t_task_tage_1.leader_name like ? or t_task_tage_1.task_alias_name like ?)`
 	}
 	}
 	sqlStr := withSql + whereSql
 	sqlStr := withSql + whereSql
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
@@ -502,23 +453,16 @@ func (d *TaskDao) CountTaskAnomalyByHrbp(param ListTaskCondition) (int, error) {
 	)select count(*) 
 	)select count(*) 
 	from task
 	from task
 	left join t_task_ignore on t_task_ignore.task_id=task.id
 	left join t_task_ignore on t_task_ignore.task_id=task.id
-	where 1=1 and task.anomaly>1 `
-	condition := []interface{}{param.UserId}
+	where 1=1 and task.anomaly>1 and task.company_id=?`
+	condition := []interface{}{param.UserId, param.CompanyId}
 	whereSql := ``
 	whereSql := ``
 	if param.OnlyMy {
 	if param.OnlyMy {
 		condition = append(condition, param.UserId)
 		condition = append(condition, param.UserId)
 		whereSql += ` and task.leader ->>'id' = '?' `
 		whereSql += ` and task.leader ->>'id' = '?' `
-	} else if param.LeaderName != "" {
-		condition = append(condition, param.LeaderName)
-		whereSql += ` and task.leader ->>'id' = ? `
-	}
-	if len(param.TaskName) > 0 {
-		condition = append(condition, param.TaskName)
-		whereSql += ` and task.name like ? `
 	}
 	}
-	if len(param.LevelName) > 0 {
-		condition = append(condition, param.LevelName)
-		whereSql += ` and task.level_name like ? `
+	if param.SearchWord != "" {
+		condition = append(condition, param.SearchWord, param.SearchWord)
+		whereSql += ` and (t_task_tage_1.leader_name like ? or t_task_tage_1.task_alias_name like ?)`
 	}
 	}
 	sqlStr := withSql + whereSql
 	sqlStr := withSql + whereSql
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
@@ -543,7 +487,9 @@ func (d *TaskDao) ListTask2(userId int) ([]TaskData1, error) {
 	task.leader ->>'id' as leader_id,
 	task.leader ->>'id' as leader_id,
 	task.leader ->>'name' as leader_name,
 	task.leader ->>'name' as leader_name,
 	task.level_name 
 	task.level_name 
-	from task  `
+	from task  
+	join t_task_1 on task.id =t_task_1.id
+	`
 	result := []TaskData1{}
 	result := []TaskData1{}
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
 	_, err := tx.Query(&result, sqlStr)
 	_, err := tx.Query(&result, sqlStr)
@@ -551,7 +497,7 @@ func (d *TaskDao) ListTask2(userId int) ([]TaskData1, error) {
 }
 }
 
 
 // 获取任务列表
 // 获取任务列表
-func (d *TaskDao) ListTask2ForHrbp(userId int) ([]TaskData1, error) {
+func (d *TaskDao) ListTask2ForHrbp(userId int, companyId int) ([]TaskData1, error) {
 	sqlStr := `with 
 	sqlStr := `with 
 	t_task_ignore as (
 	t_task_ignore as (
 		select task_ignore.task_id,task_ignore.id  from  task_ignore where task_ignore.user_id =?
 		select task_ignore.task_id,task_ignore.id  from  task_ignore where task_ignore.user_id =?
@@ -561,10 +507,10 @@ func (d *TaskDao) ListTask2ForHrbp(userId int) ([]TaskData1, error) {
 	task.level_name 
 	task.level_name 
 	from task
 	from task
 	left join t_task_ignore on t_task_ignore.task_id=task.id
 	left join t_task_ignore on t_task_ignore.task_id=task.id
-	where 1=1 `
+	where 1=1 and task.company_id=? `
 	result := []TaskData1{}
 	result := []TaskData1{}
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
-	_, err := tx.Query(&result, sqlStr, userId)
+	_, err := tx.Query(&result, sqlStr, userId, companyId)
 	return result, err
 	return result, err
 
 
 }
 }