作者 tangxvhui

Merge branch 'dev-tangxvhui' into test

... ... @@ -477,6 +477,7 @@ func (srv StaffAssessServeice) buildTaskRecord(staffAssess *domain.StaffAssess)
TaskLeader: taskList[0].Leader,
AssistLevel: 0,
AssistContent: "",
AnomalyState: domain.AnomalyState1,
TaskStages: []domain.TaskStage{},
TaskStageCheck: domain.TaskStage{},
}
... ...
... ... @@ -462,7 +462,7 @@ func (d *TaskDao) TaskAnomalyByLeader(leaderId []string, anomaly int) ([]TaskDat
return result, err
}
// 统计任务异常的数量,以非hrbp角色统计
// 统计任务反馈异常的数量,以非hrbp角色统计
func (d *TaskDao) CountTaskAnomalyNotHrbp(param ListTaskCondition) (int, error) {
task1 := d.catchTaskIdByPermission(param.UserId)
withSql := task1 + ` select count(*)
... ... @@ -487,7 +487,7 @@ func (d *TaskDao) CountTaskAnomalyNotHrbp(param ListTaskCondition) (int, error)
return cnt, err
}
// 统计任务异常的数量,以hrbp角色统计
// 统计任务反馈异常的数量,以hrbp角色统计
func (d *TaskDao) CountTaskAnomalyByHrbp(param ListTaskCondition) (int, error) {
withSql := `with
t_task_ignore as (
... ...
... ... @@ -130,7 +130,9 @@ func (repo *TaskRepository) Find(queryOptions map[string]interface{}) (int, []*d
if val, ok := queryOptions["companyId"]; ok {
query.Where("task.company_id = ?", val)
}
if val, ok := queryOptions["id"]; ok {
query.Where("task.id=?", val)
}
if val, ok := queryOptions["leaderId"]; ok {
query.Where("task.leader->>'id'=?", val)
}
... ...