allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 7f250c5ce782fcbf456bc4c2a34d788349f65adf 1 个父辈 cfa57b7b

日常保存

内嵌 并排对比
正在显示 2 个修改的文件 包含 58 行增加 和 2 行删除
... ... @@ -7,6 +7,7 @@ type TaskAnomalyItem struct {
TaskRecordId int `json:"taskRecordId,string"` // 任务反馈记录id
Category int `json:"category"` // 异常分类
Leader string `json:"leader"` // 任务负责人
LeaderId string `json:"leaderId"` // 任务负责人
CurrentStage TaskStage `json:"currentStage"` // 计划进度的里程碑
LastStage TaskStage `json:"lastStage"` // 实际进度完成的里程碑
TaskStageCheck TaskStage `json:"taskStageCheck"` // 实际进度完成的里程碑
... ... @@ -30,6 +31,6 @@ type TaskAnomalyItem struct {
// 任务异常记录列表 ,按照任务负责人进行归类
type TaskAnomalyItem2 struct {
Leader map[string]string
TaskAnomaly []TaskAnomalyItem
Leader map[string]string `json:"leader"`
TaskAnomaly []TaskAnomalyItem `json:"taskAnomaly"`
}
... ...
... ... @@ -3,6 +3,7 @@ package service
import (
"fmt"
"strconv"
"strings"
"time"
"github.com/linmadan/egglib-go/core/application"
... ... @@ -55,6 +56,7 @@ func (srv TaskService) listTaskAnomaly2(param *command.ListTaskAnomalyCommand) (
TaskRecordId: val.TaskRecordId,
Category: val.Category,
Leader: val.LeaderName,
LeaderId: val.LeaderId,
CurrentStage: adapter.TaskStage{
Id: val.CurrentStage.Id,
Name: val.CurrentStage.Name,
... ... @@ -98,6 +100,12 @@ func (srv TaskService) listTaskAnomaly2(param *command.ListTaskAnomalyCommand) (
if val.LastStage.RealCompletedAt > 0 {
item.LastStage.RealCompletedAt = time.Unix(val.LastStage.RealCompletedAt, 0).Local().Format("2006-01-02")
}
noticeWho := []string{}
for _, val2 := range val.NoticeWho {
if name, ok := val2["name"]; ok {
noticeWho = append(noticeWho, name)
}
}
switch val.Category {
case 1:
{
... ... @@ -111,6 +119,7 @@ func (srv TaskService) listTaskAnomaly2(param *command.ListTaskAnomalyCommand) (
"types": "10",
"stageName": val.TaskStageCheck.Name,
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
} else if val.TaskStageCheck.RealCompletedAt > 0 && val.TaskStageCheck.Id > 0 {
... ... @@ -123,6 +132,7 @@ func (srv TaskService) listTaskAnomaly2(param *command.ListTaskAnomalyCommand) (
"types": "11",
"stageName": val.TaskStageCheck.Name,
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
}
}
... ... @@ -140,6 +150,7 @@ func (srv TaskService) listTaskAnomaly2(param *command.ListTaskAnomalyCommand) (
"types": "2",
"dayTime": recordBegin.Local().Format("2006-01-02"),
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
}
case 3:
... ... @@ -156,6 +167,7 @@ func (srv TaskService) listTaskAnomaly2(param *command.ListTaskAnomalyCommand) (
"types": "3",
"dayTime": recordBegin.Local().Format("2006-01-02"),
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
}
}
... ... @@ -209,6 +221,7 @@ func (srv TaskService) listTaskAnomaly3(param *command.ListTaskAnomalyCommand) (
TaskId: val.TaskId,
TaskRecordId: val.TaskRecordId,
Category: val.Category,
LeaderId: val.LeaderId,
Leader: val.LeaderName,
CurrentStage: adapter.TaskStage{
Id: val.CurrentStage.Id,
... ... @@ -253,6 +266,12 @@ func (srv TaskService) listTaskAnomaly3(param *command.ListTaskAnomalyCommand) (
if val.LastStage.RealCompletedAt > 0 {
item.LastStage.RealCompletedAt = time.Unix(val.LastStage.RealCompletedAt, 0).Local().Format("2006-01-02")
}
noticeWho := []string{}
for _, val2 := range val.NoticeWho {
if name, ok := val2["name"]; ok {
noticeWho = append(noticeWho, name)
}
}
switch val.Category {
case 1:
{
... ... @@ -266,6 +285,7 @@ func (srv TaskService) listTaskAnomaly3(param *command.ListTaskAnomalyCommand) (
"types": "10",
"stageName": val.TaskStageCheck.Name,
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
} else if val.TaskStageCheck.RealCompletedAt > 0 && val.TaskStageCheck.Id > 0 {
//逾期完成
... ... @@ -277,6 +297,7 @@ func (srv TaskService) listTaskAnomaly3(param *command.ListTaskAnomalyCommand) (
"types": "11",
"stageName": val.TaskStageCheck.Name,
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
}
}
... ... @@ -294,6 +315,7 @@ func (srv TaskService) listTaskAnomaly3(param *command.ListTaskAnomalyCommand) (
"types": "2",
"dayTime": recordBegin.Local().Format("2006-01-02"),
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
}
case 3:
... ... @@ -310,6 +332,7 @@ func (srv TaskService) listTaskAnomaly3(param *command.ListTaskAnomalyCommand) (
"types": "3",
"dayTime": recordBegin.Local().Format("2006-01-02"),
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
}
}
... ... @@ -460,6 +483,12 @@ func (srv TaskService) ListTaskAnomaly1(param *command.ListTaskAnomalyCommand) (
if val.LastStage.RealCompletedAt > 0 {
item.LastStage.RealCompletedAt = time.Unix(val.LastStage.RealCompletedAt, 0).Local().Format("2006-01-02")
}
noticeWho := []string{}
for _, val2 := range val.NoticeWho {
if name, ok := val2["name"]; ok {
noticeWho = append(noticeWho, name)
}
}
switch val.Category {
case domain.AnomalyCategoryType1:
{
... ... @@ -473,6 +502,7 @@ func (srv TaskService) ListTaskAnomaly1(param *command.ListTaskAnomalyCommand) (
"types": "10",
"stageName": val.TaskStageCheck.Name,
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
} else if val.TaskStageCheck.RealCompletedAt > 0 && val.TaskStageCheck.Id > 0 {
... ... @@ -485,6 +515,7 @@ func (srv TaskService) ListTaskAnomaly1(param *command.ListTaskAnomalyCommand) (
"types": "11",
"stageName": val.TaskStageCheck.Name,
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
}
}
... ... @@ -502,6 +533,7 @@ func (srv TaskService) ListTaskAnomaly1(param *command.ListTaskAnomalyCommand) (
"types": "2",
"dayTime": recordBegin.Local().Format("2006-01-02"),
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
}
case domain.AnomalyCategoryType3:
... ... @@ -518,6 +550,7 @@ func (srv TaskService) ListTaskAnomaly1(param *command.ListTaskAnomalyCommand) (
"types": "3",
"dayTime": recordBegin.Local().Format("2006-01-02"),
"interval": strconv.Itoa(subDay),
"noticeWho": strings.Join(noticeWho, ","),
}
}
}
... ... @@ -609,3 +642,25 @@ func (srv TaskService) MarkTaskAnomaly(param *command.MarkTaskAnomalyCommand) (m
}
return map[string]string{}, nil
}
// 我的下级负责任务，异常列表
// 按任务负责人归类，列表整理成树形结构
func (srv TaskService) ListTreeTaskAnomaly2(param *command.ListTaskAnomalyCommand) (map[string]interface{}, error) {
_, taskAnomalyList, err := srv.listTaskAnomaly2(param)
if err != nil {
return map[string]interface{}{
"list": []adapter.TaskAnomalyItem2{},
}, nil
}
if len(taskAnomalyList) == 0 {
return map[string]interface{}{
"list": []adapter.TaskAnomalyItem2{},
}, nil
}
// leaderMap := map[string]*adapter.TaskAnomalyItem2{}
// var treeList []*adapter.TaskAnomalyItem2
// for _, val := range taskAnomalyList {
// leader, ok := leaderMap[val.Leader]
// }
return nil, nil
}
... ...