调试

@@ -23,7 +23,7 @@ func (service *AuthService) MobileLogin(param *command.MobileLoginCommand) (map[
 	// 统一用户中心登录
 	// 统一用户中心登录
 	authCodeReply, err := factory.UCenterApi().AppAuthCode(param.Credentials, param.Cuid, param.Cid)
 	authCodeReply, err := factory.UCenterApi().AppAuthCode(param.Credentials, param.Cuid, param.Cid)
 	if err != nil || !authCodeReply.IsOk() {
 	if err != nil || !authCodeReply.IsOk() {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统一用户中心认证："+authCodeReply.Msg)
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统一用户中心认证："+authCodeReply.Msg+err.Error())
 	}
 	}
 	// 用户权限校验
 	// 用户权限校验
 	// 登录平台ID，28-绩效管理后台  29-员工绩效
 	// 登录平台ID，28-绩效管理后台  29-员工绩效
@@ -97,7 +97,7 @@ func (srv *AuthService) Authorize(param *command.AuthorizeCommand) (map[string]i
 	// 统一用户中心登录
 	// 统一用户中心登录
 	authCodeReply, err := factory.UCenterApi().AppAuthCode(param.Credentials, param.Cuid, param.Cid)
 	authCodeReply, err := factory.UCenterApi().AppAuthCode(param.Credentials, param.Cuid, param.Cid)
 	if err != nil || !authCodeReply.IsOk() {
 	if err != nil || !authCodeReply.IsOk() {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统一用户中心认证："+authCodeReply.Msg)
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统一用户中心认证："+authCodeReply.Msg+err.Error())
 	}
 	}
 	// 用户权限校验
 	// 用户权限校验
 	// 登录平台ID， 29-员工绩效
 	// 登录平台ID， 29-员工绩效

@@ -27,7 +27,7 @@ func (service *AuthService) Login(loginCommand *command.LoginCommand) (interface
 	//统一用户中心登录
 	//统一用户中心登录
 	authCodeReply, err := factory.UCenterApi().AuthCode(loginCommand.Code)
 	authCodeReply, err := factory.UCenterApi().AuthCode(loginCommand.Code)
 	if err != nil || !authCodeReply.IsOk() {
 	if err != nil || !authCodeReply.IsOk() {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统一用户中心认证失败")
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统一用户中心认证失败"+authCodeReply.Msg+err.Error())
 	}
 	}
 	//用户权限校验
 	//用户权限校验
 	userAuthReply, err := factory.BusinessAdminApi().GetUserAuth(authCodeReply.Data.MUid, loginCommand.PlatformId)
 	userAuthReply, err := factory.BusinessAdminApi().GetUserAuth(authCodeReply.Data.MUid, loginCommand.PlatformId)

@@ -194,8 +194,8 @@ func (srv TaskService) CreateTask(param *command.CreateTaskCommand, userReq *dom
 		RunAt:         nowTime.Unix(),
 		RunAt:         nowTime.Unix(),
 		StopAt:        0,
 		StopAt:        0,
 		SortBy:        domain.TaskSortBy(param.SortBy),
 		SortBy:        domain.TaskSortBy(param.SortBy),
-		CreatedBy:     1,
-		AssistFlagMax: 0,
+		CreatedBy:     1, //标记为页面上直接创建的任务
+		AssistFlagMax: 1, //默认一天
 	}
 	}
 	//处理endTime
 	//处理endTime
 	if param.EndTime == 0 {
 	if param.EndTime == 0 {
@@ -392,7 +392,9 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand, userReq *dom
 		taskData.EndTime = dayEndTime(time.Unix(param.EndTime, 10)).Unix()
 		taskData.EndTime = dayEndTime(time.Unix(param.EndTime, 10)).Unix()
 	}
 	}
 	taskData.UseEndTime = param.UseEndTime
 	taskData.UseEndTime = param.UseEndTime
-	taskData.AssistFlagMax = param.AssistFlagMax
+	if param.AssistFlagMax > 0 {
+		taskData.AssistFlagMax = param.AssistFlagMax
+	}
 	err = taskRepo.Save(taskData)
 	err = taskRepo.Save(taskData)
 	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())

@@ -153,20 +153,29 @@ func (d *TaskDao) CountTaskByHrbp(param ListTaskCondition) (int, error) {
 // 统计里程碑异常的数量,以非hrbp角色统计
 // 统计里程碑异常的数量,以非hrbp角色统计
 func (d *TaskDao) CountTaskStageAnomalyNotHrbp(param ListTaskCondition) (int, error) {
 func (d *TaskDao) CountTaskStageAnomalyNotHrbp(param ListTaskCondition) (int, error) {
 	task1 := d.catchTaskIdByPermission(param.UserId)
 	task1 := d.catchTaskIdByPermission(param.UserId)
+	// withSql := task1 + ` select count(*)
+	// from task
+	// join t_task_1 on task.id =t_task_1.id
+	// where 1=1
+	// and task.company_id =?
+	// and task.deleted_at isnull
+	// and (
+	// 		(
+	// 		cast(COALESCE(task.current_stage ->>'planCompletedAt','0') as int)>0 and
+	// 		cast(COALESCE(task.current_stage ->>'planCompletedAt','0') as int)<floor(extract(epoch from now()))
+	// 		)
+	// 	or
+	// 	task.warn_flag = 1
+	// )
+	// `
 	withSql := task1 + ` select count(*)
 	withSql := task1 + ` select count(*)
 	from task
 	from task
 	join t_task_1 on task.id =t_task_1.id
 	join t_task_1 on task.id =t_task_1.id
 	where 1=1
 	where 1=1
 	and task.company_id =?
 	and task.company_id =?
 	and task.deleted_at isnull
 	and task.deleted_at isnull
-	and (
-			(
-			cast(COALESCE(task.current_stage ->>'planCompletedAt','0') as int)>0 and  
-			cast(COALESCE(task.current_stage ->>'planCompletedAt','0') as int)<floor(extract(epoch from now()))
-			)
-		or 
-		task.warn_flag = 1
-	)
+	and task.warn_flag >0
+	
 	`
 	`
 	condition := []interface{}{param.CompanyId}
 	condition := []interface{}{param.CompanyId}
 	whereSql := ``
 	whereSql := ``
@@ -191,6 +200,24 @@ func (d *TaskDao) CountTaskStageAnomalyNotHrbp(param ListTaskCondition) (int, er
 
 
 // 统计里程碑异常的数量,以hrbp角色统计
 // 统计里程碑异常的数量,以hrbp角色统计
 func (d *TaskDao) CountTaskStageAnomalyByHrbp(param ListTaskCondition) (int, error) {
 func (d *TaskDao) CountTaskStageAnomalyByHrbp(param ListTaskCondition) (int, error) {
+	// withSql := `with
+	// t_task_ignore as (
+	// 	select task_ignore.task_id,task_ignore.id  from  task_ignore where task_ignore.user_id =?
+	// )select count(*)
+	// from task
+	// left join t_task_ignore on t_task_ignore.task_id=task.id
+	// where 1=1
+	// and task.company_id =?
+	// and task.deleted_at isnull
+	// and t_task_ignore.id isnull
+	// and (
+	// 	 (
+	// 		cast(COALESCE(task.current_stage ->>'planCompletedAt','0') as int)>0 and
+	// 		cast(COALESCE(task.current_stage ->>'planCompletedAt','0') as int)<floor(extract(epoch from now()))
+	// 	 )
+	// 	or
+	// 	task.warn_flag = 1
+	// )`
 	withSql := `with 
 	withSql := `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 =?
@@ -201,14 +228,7 @@ func (d *TaskDao) CountTaskStageAnomalyByHrbp(param ListTaskCondition) (int, err
 	and task.company_id =?
 	and task.company_id =?
 	and task.deleted_at isnull
 	and task.deleted_at isnull
 	and t_task_ignore.id isnull 
 	and t_task_ignore.id isnull 
-	and (
-		 (
-			cast(COALESCE(task.current_stage ->>'planCompletedAt','0') as int)>0 and  
-			cast(COALESCE(task.current_stage ->>'planCompletedAt','0') as int)<floor(extract(epoch from now()))
-		 )
-		or 
-		task.warn_flag = 1
-	)`
+	and task.warn_flag > 0 `
 	condition := []interface{}{param.UserId, param.CompanyId}
 	condition := []interface{}{param.UserId, param.CompanyId}
 	whereSql := ``
 	whereSql := ``
 	if param.OnlyMy {
 	if param.OnlyMy {
@@ -471,7 +491,6 @@ and task.anomaly>0 `
 type ListTask struct {
 type ListTask struct {
 	SortBy1          int              `pg:"sort_by_1"`
 	SortBy1          int              `pg:"sort_by_1"`
 	CPlanCompletedAt int              `pg:"c_plan_completed_at"`
 	CPlanCompletedAt int              `pg:"c_plan_completed_at"`
-	SortBy2          int              `pg:"sort_by_2"`
 	TaskId           int              `pg:"task_id"`
 	TaskId           int              `pg:"task_id"`
 	Alias            string           `pg:"alias"`
 	Alias            string           `pg:"alias"`
 	LeaderName       string           `pg:"leader_name"`
 	LeaderName       string           `pg:"leader_name"`
@@ -479,6 +498,7 @@ type ListTask struct {
 	Level            int              `pg:"level"`
 	Level            int              `pg:"level"`
 	LevelName        string           `pg:"level_name"`
 	LevelName        string           `pg:"level_name"`
 	Anomaly          int              `pg:"anomaly"`
 	Anomaly          int              `pg:"anomaly"`
+	WarnFlag         int              `pg:"warn_flag"`
 	Status           int              `pg:"status"`
 	Status           int              `pg:"status"`
 	UpdatedAt        time.Time        `pg:"updated_at"`
 	UpdatedAt        time.Time        `pg:"updated_at"`
 	CreatedAt        time.Time        `pg:"created_at"`
 	CreatedAt        time.Time        `pg:"created_at"`
@@ -511,6 +531,7 @@ func (d *TaskDao) ListTaskByHrbpV2(param ListTaskCondition) ([]ListTask, error)
 		task."level",
 		task."level",
 		task.level_name ,
 		task.level_name ,
 		task.anomaly ,
 		task.anomaly ,
+		task.warn_flag ,
 		task.status ,
 		task.status ,
 		task.updated_at,
 		task.updated_at,
 		task.current_stage,
 		task.current_stage,
@@ -531,11 +552,6 @@ func (d *TaskDao) ListTaskByHrbpV2(param ListTaskCondition) ([]ListTask, error)
 			when t_task.c_plan_completed_at-now_time>0 then 0
 			when t_task.c_plan_completed_at-now_time>0 then 0
 			else t_task.c_plan_completed_at-now_time
 			else t_task.c_plan_completed_at-now_time
 			end) as sort_by_1,
 			end) as sort_by_1,
-		(case
-			when t_task.l_plan_completed_at=0 then 0
-			when t_task.l_plan_completed_at-t_task.l_real_completed_at>0 then 0
-			else t_task.l_plan_completed_at-t_task.l_real_completed_at
-		end) as sort_by_2,
 		t_task.c_plan_completed_at ,
 		t_task.c_plan_completed_at ,
 		t_task.id as task_id,
 		t_task.id as task_id,
 		t_task.alias ,
 		t_task.alias ,
@@ -544,6 +560,7 @@ func (d *TaskDao) ListTaskByHrbpV2(param ListTaskCondition) ([]ListTask, error)
 		t_task."level",
 		t_task."level",
 		t_task.level_name ,
 		t_task.level_name ,
 		t_task.anomaly ,
 		t_task.anomaly ,
+		t_task.warn_flag ,
 		t_task.status ,
 		t_task.status ,
 		t_task.updated_at ,
 		t_task.updated_at ,
 		t_task.current_stage,
 		t_task.current_stage,
@@ -556,7 +573,7 @@ func (d *TaskDao) ListTaskByHrbpV2(param ListTaskCondition) ([]ListTask, error)
 	)select *
 	)select *
 	from t_task_1
 	from t_task_1
 	order by t_task_1.status, t_task_1.sort_by_1,
 	order by t_task_1.status, t_task_1.sort_by_1,
-	t_task_1.sort_by_2,t_task_1.anomaly desc,
+	t_task_1.anomaly desc,
 	t_task_1.sort_by,t_task_1."created_at"
 	t_task_1.sort_by,t_task_1."created_at"
 	limit ? offset ?
 	limit ? offset ?
 	`
 	`
@@ -598,6 +615,7 @@ func (d *TaskDao) ListTaskNotHrbpV2(param ListTaskCondition) ([]ListTask, error)
 		task."level",
 		task."level",
 		task.level_name ,
 		task.level_name ,
 		task.anomaly ,
 		task.anomaly ,
+		task.warn_flag ,
 		task.current_stage,
 		task.current_stage,
 		task.last_stage,
 		task.last_stage,
 		task.status ,
 		task.status ,
@@ -617,11 +635,6 @@ func (d *TaskDao) ListTaskNotHrbpV2(param ListTaskCondition) ([]ListTask, error)
 			when t_task.c_plan_completed_at-now_time>0 then 0
 			when t_task.c_plan_completed_at-now_time>0 then 0
 			else t_task.c_plan_completed_at-now_time
 			else t_task.c_plan_completed_at-now_time
 			end) as sort_by_1,
 			end) as sort_by_1,
-		(case
-			when t_task.l_plan_completed_at=0 then 0
-			when t_task.l_plan_completed_at-t_task.l_real_completed_at>0 then 0
-			else t_task.l_plan_completed_at-t_task.l_real_completed_at
-		end) as sort_by_2,
 		t_task.c_plan_completed_at ,
 		t_task.c_plan_completed_at ,
 		t_task.id as task_id,
 		t_task.id as task_id,
 		t_task.alias ,
 		t_task.alias ,
@@ -630,6 +643,7 @@ func (d *TaskDao) ListTaskNotHrbpV2(param ListTaskCondition) ([]ListTask, error)
 		t_task."level",
 		t_task."level",
 		t_task.level_name ,
 		t_task.level_name ,
 		t_task.anomaly ,
 		t_task.anomaly ,
+		t_task.warn_flag ,
 		t_task.current_stage,
 		t_task.current_stage,
 		t_task.last_stage,
 		t_task.last_stage,
 		t_task.status ,
 		t_task.status ,
@@ -642,7 +656,7 @@ func (d *TaskDao) ListTaskNotHrbpV2(param ListTaskCondition) ([]ListTask, error)
 	)select *
 	)select *
 	from tt_task_1
 	from tt_task_1
 	order by tt_task_1.status,tt_task_1.sort_by_1,
 	order by tt_task_1.status,tt_task_1.sort_by_1,
-	tt_task_1.sort_by_2,tt_task_1.anomaly desc,
+	tt_task_1.anomaly desc,
 	tt_task_1.sort_by,tt_task_1."created_at"
 	tt_task_1.sort_by,tt_task_1."created_at"
 	limit ? offset ?
 	limit ? offset ?
 	`
 	`
@@ -789,27 +803,92 @@ and (task.leader ->>'id' in(?) or task.related_user @>?)
 	return result, err
 	return result, err
 }
 }
 
 
-// 按照 任务的相关人员（related_user)，排除 既是相关人员，又是任务负责人的情况, 获取出现异常的任务
-// func (d *TaskDao) TaskIsAnomalyByRelatedUser(relatedUserId int) ([]TaskData6, error) {
-// 	sqlStr := `select
-// 	task.id as task_id,
-// 	task."name" as task_name ,
-// 	task.alias as task_alias,
-// 	task.leader ->>'id' as leader_id,
-// 	task.leader ->>'name' as leader_name,
-// 	task.assist_flag ,
-// 	task.warn_flag ,
-// 	task.anomaly
-// from task where 1=1
-// and task.deleted_at isnull
-// and (task.assist_flag+task.warn_flag +task.anomaly)>0
-// and task.related_user @>?
-// and task.leader ->>'id' <> ?
-// `
-// 	relatedUser := fmt.Sprintf("[%d]", relatedUserId)
-// 	condition := []interface{}{relatedUser, strconv.Itoa(relatedUserId)}
-// 	result := []TaskData6{}
-// 	tx := d.transactionContext.PgTx
-// 	_, err := tx.Query(&result, sqlStr, condition...)
-// 	return result, err
-// }
+// 员工绩效-任务列表 查询任务列表
+// userid 谁要查看任务数据
+// limit 分页
+// offset 分页
+func (d *TaskDao) ListTaskByHrbpV3(param ListTaskCondition) ([]ListTask, error) {
+	sqlStr := `
+	with 
+	t_task_ignore as (
+		select task_ignore.task_id,task_ignore.id  from  task_ignore where task_ignore.user_id =?
+	),
+	t_task as (
+		select 
+		cast(COALESCE(task.current_stage ->>'planCompletedAt','0') as int)  as c_plan_completed_at,
+		cast(COALESCE(task.current_stage ->>'realCompletedAt','0') as int)  as c_real_completed_at,
+		floor(extract(epoch from now())) as now_time,
+		task.id ,
+		task.alias ,
+		task.leader ->>'name' as leader_name,
+		task.leader ->>'id' as leader_id,
+		task."level",
+		task.level_name ,
+		task.anomaly ,
+		task.warn_flag ,
+		task.status ,
+		task.updated_at,
+		task.current_stage,
+		task.last_stage,
+		task.sort_by,
+		task.end_time,
+		task.created_at 
+		from task 
+		left join  t_task_ignore on t_task_ignore.task_id=task.id
+		where 1=1 and t_task_ignore.id isnull and task.company_id=?
+		and task.deleted_at isnull
+		%s
+	),
+	t_task_1 as (
+		select 
+		(case 
+			when t_task.c_plan_completed_at=0 then 0
+			when t_task.c_plan_completed_at-now_time>0 then 0
+			else t_task.c_plan_completed_at-now_time
+			end) as sort_by_1,
+		t_task.c_plan_completed_at ,
+		t_task.id as task_id,
+		t_task.alias ,
+		t_task.leader_name,
+		t_task.leader_id,
+		t_task."level",
+		t_task.level_name ,
+		t_task.anomaly ,
+		t_task.warn_flag ,
+		t_task.status ,
+		t_task.updated_at ,
+		t_task.current_stage,
+		t_task.last_stage,
+		t_task.sort_by,
+		t_task.end_time,
+		t_task.created_at
+		from t_task  
+		where 1=1
+	)select *
+	from t_task_1
+	order by t_task_1.status, t_task_1.sort_by_1,
+	t_task_1.anomaly desc,
+	t_task_1.sort_by,t_task_1."created_at"
+	limit ? offset ?
+	`
+	condition := []interface{}{param.UserId, param.CompanyId}
+	whereSql := ``
+	if param.OnlyMy {
+		condition = append(condition, param.UserId)
+		whereSql += ` and task.leader ->>'id' = '?' `
+	}
+	if param.SearchWord != "" {
+		condition = append(condition, param.SearchWord, param.SearchWord)
+		whereSql += ` and (task.leader->>'name' like ? or task.alias like ?)`
+	}
+	if len(param.LevelName) > 0 {
+		condition = append(condition, param.LevelName)
+		whereSql += ` and task.level_name = ? `
+	}
+	strSql2 := fmt.Sprintf(sqlStr, whereSql)
+	condition = append(condition, param.Limit, param.Offset)
+	result := []ListTask{}
+	tx := d.transactionContext.PgTx
+	_, err := tx.Query(&result, strSql2, condition...)
+	return result, err
+}