正在显示
2 个修改的文件
包含
9 行增加
和
0 行删除
@@ -266,8 +266,13 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G | @@ -266,8 +266,13 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G | ||
266 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 266 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
267 | } | 267 | } |
268 | } | 268 | } |
269 | + uidStr := strconv.Itoa(param.UserId) | ||
269 | //我作为任务相关人 | 270 | //我作为任务相关人 |
270 | for _, val := range taskStageList0 { | 271 | for _, val := range taskStageList0 { |
272 | + | ||
273 | + if val.LeaderId == uidStr { | ||
274 | + continue | ||
275 | + } | ||
271 | s := fmt.Sprintf("【您关注的【%s】里程碑未按时完成,请知晓。】", val.TaskAlias) | 276 | s := fmt.Sprintf("【您关注的【%s】里程碑未按时完成,请知晓。】", val.TaskAlias) |
272 | msgList = append(msgList, adapter.MessageListAdapter{ | 277 | msgList = append(msgList, adapter.MessageListAdapter{ |
273 | Content: s, | 278 | Content: s, |
@@ -277,6 +282,7 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G | @@ -277,6 +282,7 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G | ||
277 | "task_alias": val.TaskAlias, | 282 | "task_alias": val.TaskAlias, |
278 | "task_name": val.TaskName, | 283 | "task_name": val.TaskName, |
279 | } | 284 | } |
285 | + | ||
280 | payloadStr, _ := json.Marshal(payload) | 286 | payloadStr, _ := json.Marshal(payload) |
281 | newMessage := domain.MessagePersonal{ | 287 | newMessage := domain.MessagePersonal{ |
282 | Id: 0, | 288 | Id: 0, |
@@ -403,6 +403,7 @@ type TaskData3 struct { | @@ -403,6 +403,7 @@ type TaskData3 struct { | ||
403 | TaskName string `pg:"task_name"` | 403 | TaskName string `pg:"task_name"` |
404 | TaskAlias string `pg:"task_alias"` | 404 | TaskAlias string `pg:"task_alias"` |
405 | LeaderName string `pg:"leader_name"` | 405 | LeaderName string `pg:"leader_name"` |
406 | + LeaderId string `pg:"leader_id"` | ||
406 | } | 407 | } |
407 | 408 | ||
408 | // 根据负责人获取超期未完成的异常的里程碑任务 | 409 | // 根据负责人获取超期未完成的异常的里程碑任务 |
@@ -410,6 +411,7 @@ func (d *TaskDao) TaskStageAnomalyByLeader(leaderId []string) ([]TaskData3, erro | @@ -410,6 +411,7 @@ func (d *TaskDao) TaskStageAnomalyByLeader(leaderId []string) ([]TaskData3, erro | ||
410 | sqlStr := `select distinct | 411 | sqlStr := `select distinct |
411 | task.id as task_id, | 412 | task.id as task_id, |
412 | task.leader ->>'name' as leader_name, | 413 | task.leader ->>'name' as leader_name, |
414 | + task.leader ->>'id' as leader_id, | ||
413 | task.alias as task_alias, | 415 | task.alias as task_alias, |
414 | task.name as task_name | 416 | task.name as task_name |
415 | from task | 417 | from task |
@@ -428,6 +430,7 @@ func (d *TaskDao) TaskStageAnomalyByRelatedUser(relatedUserId int) ([]TaskData3, | @@ -428,6 +430,7 @@ func (d *TaskDao) TaskStageAnomalyByRelatedUser(relatedUserId int) ([]TaskData3, | ||
428 | sqlStr := `select distinct | 430 | sqlStr := `select distinct |
429 | task.id as task_id, | 431 | task.id as task_id, |
430 | task.leader ->>'name' as leader_name, | 432 | task.leader ->>'name' as leader_name, |
433 | + task.leader ->>'id' as leader_id, | ||
431 | task.alias as task_alias, | 434 | task.alias as task_alias, |
432 | task.name as task_name | 435 | task.name as task_name |
433 | from task | 436 | from task |
-
请 注册 或 登录 后发表评论