|
@@ -1326,7 +1326,20 @@ func (srv TaskService) listTask3ForHrbp(param *command.SearchTaskCommand) (map[s |
|
@@ -1326,7 +1326,20 @@ func (srv TaskService) listTask3ForHrbp(param *command.SearchTaskCommand) (map[s |
|
1326
|
if err != nil {
|
1326
|
if err != nil {
|
|
1327
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统计任务反馈异常总数"+err.Error())
|
1327
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统计任务反馈异常总数"+err.Error())
|
|
1328
|
}
|
1328
|
}
|
|
1329
|
-
|
1329
|
+ var taskAnomalyList []*domain.TaskAnomaly
|
|
|
|
1330
|
+ //获取异常的任务反馈记录
|
|
|
|
1331
|
+ taskAnomalyRepo := factory.CreateTaskAnomalyRepository(map[string]interface{}{
|
|
|
|
1332
|
+ "transactionContext": transactionContext,
|
|
|
|
1333
|
+ })
|
|
|
|
1334
|
+ for _, val := range taskListData {
|
|
|
|
1335
|
+ _, listData, err := taskAnomalyRepo.Find(map[string]interface{}{
|
|
|
|
1336
|
+ "taskId": val.TaskId,
|
|
|
|
1337
|
+ "is_last": 1,
|
|
|
|
1338
|
+ })
|
|
|
|
1339
|
+ if err == nil {
|
|
|
|
1340
|
+ taskAnomalyList = append(taskAnomalyList, listData...)
|
|
|
|
1341
|
+ }
|
|
|
|
1342
|
+ }
|
|
1330
|
taskResult := []*adapter.TaskItem{}
|
1343
|
taskResult := []*adapter.TaskItem{}
|
|
1331
|
taskStageRepo := factory.CreateTaskStageRepository(map[string]interface{}{
|
1344
|
taskStageRepo := factory.CreateTaskStageRepository(map[string]interface{}{
|
|
1332
|
"transactionContext": transactionContext,
|
1345
|
"transactionContext": transactionContext,
|
|
@@ -1405,6 +1418,28 @@ func (srv TaskService) listTask3ForHrbp(param *command.SearchTaskCommand) (map[s |
|
@@ -1405,6 +1418,28 @@ func (srv TaskService) listTask3ForHrbp(param *command.SearchTaskCommand) (map[s |
|
1405
|
}
|
1418
|
}
|
|
1406
|
}
|
1419
|
}
|
|
1407
|
tk.GenStatusDescript()
|
1420
|
tk.GenStatusDescript()
|
|
|
|
1421
|
+ for _, val := range taskAnomalyList {
|
|
|
|
1422
|
+ if tk.Id != val.TaskId {
|
|
|
|
1423
|
+ continue
|
|
|
|
1424
|
+ }
|
|
|
|
1425
|
+ if val.Marks == nil {
|
|
|
|
1426
|
+ val.Marks = map[string]string{}
|
|
|
|
1427
|
+ }
|
|
|
|
1428
|
+ r := val.Remark + ",该条异常已通知"
|
|
|
|
1429
|
+ for _, val2 := range val.NoticeWho {
|
|
|
|
1430
|
+ r += val2["name"] + " "
|
|
|
|
1431
|
+ }
|
|
|
|
1432
|
+ tk.AnomalyDesc = append(tk.AnomalyDesc, r)
|
|
|
|
1433
|
+ switch val.Category {
|
|
|
|
1434
|
+ case domain.AnomalyCategoryType1:
|
|
|
|
1435
|
+ tk.Marks["a"] = val.Marks["a"]
|
|
|
|
1436
|
+ tk.Marks["c"] = val.Marks["c"]
|
|
|
|
1437
|
+ case domain.AnomalyCategoryType2:
|
|
|
|
1438
|
+ tk.Marks["b"] = val.Marks["b"]
|
|
|
|
1439
|
+ case domain.AnomalyCategoryType3:
|
|
|
|
1440
|
+ tk.Marks["d"] = val.Marks["d"]
|
|
|
|
1441
|
+ }
|
|
|
|
1442
|
+ }
|
|
1408
|
taskResult = append(taskResult, &tk)
|
1443
|
taskResult = append(taskResult, &tk)
|
|
1409
|
}
|
1444
|
}
|
|
1410
|
result := tool_funs.SimpleWrapGridMap(int64(taskCount), taskResult)
|
1445
|
result := tool_funs.SimpleWrapGridMap(int64(taskCount), taskResult)
|