正在显示
3 个修改的文件
包含
13 行增加
和
12 行删除
@@ -398,7 +398,7 @@ func isAssessFlag(transactionContext application.TransactionContext, taskData *d | @@ -398,7 +398,7 @@ func isAssessFlag(transactionContext application.TransactionContext, taskData *d | ||
398 | userParentId = useList[0].ParentId | 398 | userParentId = useList[0].ParentId |
399 | } | 399 | } |
400 | anomalyDay := xtime.SubDayAbs(time.Now(), time.Unix(anomalyDataTmp.RecordBegin, 0)) | 400 | anomalyDay := xtime.SubDayAbs(time.Now(), time.Unix(anomalyDataTmp.RecordBegin, 0)) |
401 | - if anomalyDay > 3 && userParentId > 0 { | 401 | + if anomalyDay >= 3 && userParentId > 0 { |
402 | _, useList2, err := userRepo.Find(map[string]interface{}{"id": userParentId, "limit": 1}) | 402 | _, useList2, err := userRepo.Find(map[string]interface{}{"id": userParentId, "limit": 1}) |
403 | if err != nil { | 403 | if err != nil { |
404 | return fmt.Errorf("获取任务Leader:%s", err) | 404 | return fmt.Errorf("获取任务Leader:%s", err) |
@@ -85,14 +85,15 @@ func (srv TaskService) CreateTaskByProject(transactionContext application.Transa | @@ -85,14 +85,15 @@ func (srv TaskService) CreateTaskByProject(transactionContext application.Transa | ||
85 | Account: leaderData.Account, | 85 | Account: leaderData.Account, |
86 | Name: leaderData.Name, | 86 | Name: leaderData.Name, |
87 | }, | 87 | }, |
88 | - Status: domain.TaskRunning, | ||
89 | - Level: 0, | ||
90 | - LevelName: "", | ||
91 | - RelatedUser: []int{int(leaderData.Id)}, | ||
92 | - RunAt: nowTime.Unix(), | ||
93 | - StopAt: 0, | ||
94 | - SortBy: domain.TaskSortNull, | ||
95 | - CreatedBy: 0, | 88 | + Status: domain.TaskRunning, |
89 | + Level: 0, | ||
90 | + LevelName: "", | ||
91 | + RelatedUser: []int{int(leaderData.Id)}, | ||
92 | + RunAt: nowTime.Unix(), | ||
93 | + StopAt: 0, | ||
94 | + SortBy: domain.TaskSortNull, | ||
95 | + CreatedBy: 0, //标记为 通过每日评估生成的任务 | ||
96 | + AssistFlagMax: 1, //默认一天 | ||
96 | } | 97 | } |
97 | if int(leaderData.ParentId) != 0 { | 98 | if int(leaderData.ParentId) != 0 { |
98 | newTask.RelatedUser = append(newTask.RelatedUser, int(leaderData.ParentId)) | 99 | newTask.RelatedUser = append(newTask.RelatedUser, int(leaderData.ParentId)) |
@@ -34,7 +34,7 @@ func (srv TaskService) listTaskAnomaly2(param *command.ListTaskAnomalyCommand) ( | @@ -34,7 +34,7 @@ func (srv TaskService) listTaskAnomaly2(param *command.ListTaskAnomalyCommand) ( | ||
34 | taskAnomalyDao := dao.NewTaskAnomalyDao(map[string]interface{}{ | 34 | taskAnomalyDao := dao.NewTaskAnomalyDao(map[string]interface{}{ |
35 | "transactionContext": transactionContext, | 35 | "transactionContext": transactionContext, |
36 | }) | 36 | }) |
37 | - limit := 500 | 37 | + limit := 1000 |
38 | offset := 0 | 38 | offset := 0 |
39 | if param.SubLevel < 2 { | 39 | if param.SubLevel < 2 { |
40 | param.SubLevel = 2 | 40 | param.SubLevel = 2 |
@@ -203,7 +203,7 @@ func (srv TaskService) listTaskAnomaly3(param *command.ListTaskAnomalyCommand) ( | @@ -203,7 +203,7 @@ func (srv TaskService) listTaskAnomaly3(param *command.ListTaskAnomalyCommand) ( | ||
203 | taskAnomalyDao := dao.NewTaskAnomalyDao(map[string]interface{}{ | 203 | taskAnomalyDao := dao.NewTaskAnomalyDao(map[string]interface{}{ |
204 | "transactionContext": transactionContext, | 204 | "transactionContext": transactionContext, |
205 | }) | 205 | }) |
206 | - limit := 500 | 206 | + limit := 1000 |
207 | offset := 0 | 207 | offset := 0 |
208 | cnt, anomalyList, err := taskAnomalyDao.List3(param.UserId, param.CompanyId, param.TaskName, param.Category, param.DayTime, param.LeaderId, limit, offset) | 208 | cnt, anomalyList, err := taskAnomalyDao.List3(param.UserId, param.CompanyId, param.TaskName, param.Category, param.DayTime, param.LeaderId, limit, offset) |
209 | if err != nil { | 209 | if err != nil { |
@@ -422,7 +422,7 @@ func (srv TaskService) ListTaskAnomaly1(param *command.ListTaskAnomalyCommand) ( | @@ -422,7 +422,7 @@ func (srv TaskService) ListTaskAnomaly1(param *command.ListTaskAnomalyCommand) ( | ||
422 | taskAnomalyDao := dao.NewTaskAnomalyDao(map[string]interface{}{ | 422 | taskAnomalyDao := dao.NewTaskAnomalyDao(map[string]interface{}{ |
423 | "transactionContext": transactionContext, | 423 | "transactionContext": transactionContext, |
424 | }) | 424 | }) |
425 | - limit := 500 | 425 | + limit := 1000 |
426 | offset := 0 | 426 | offset := 0 |
427 | cnt, anomalyList, err := taskAnomalyDao.List1(param.UserId, param.CompanyId, param.TaskName, param.Category, param.DayTime, limit, offset) | 427 | cnt, anomalyList, err := taskAnomalyDao.List1(param.UserId, param.CompanyId, param.TaskName, param.Category, param.DayTime, limit, offset) |
428 | if err != nil { | 428 | if err != nil { |
-
请 注册 或 登录 后发表评论