切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
06eeeb9543f0786dc61da05a6687f01ff3dc7db8
1 个父辈
eef18049
调整 反馈列表的输出
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
18 行增加
和
6 行删除
pkg/application/task/service/service.go
pkg/infrastructure/dao/task_dao.go
pkg/infrastructure/repository/pg_task_repository.go
pkg/application/task/service/service.go
查看文件 @
06eeeb9
...
...
@@ -910,10 +910,14 @@ func (srv TaskService) ReplyTaskStage(transactionContext application.Transaction
"transactionContext"
:
transactionContext
,
})
for
_
,
val
:=
range
param
{
taskData
,
err
:=
taskRepo
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
val
.
TaskId
})
_
,
taskDataList
,
err
:=
taskRepo
.
Find
(
map
[
string
]
interface
{}{
"id"
:
val
.
TaskId
})
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"找不到任务数据"
+
err
.
Error
())
}
if
len
(
taskDataList
)
==
0
{
continue
}
taskData
:=
taskDataList
[
0
]
_
,
stageList
,
err
:=
taskStageRepo
.
Find
(
map
[
string
]
interface
{}{
"taskId"
:
[]
int
{
val
.
TaskId
}})
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"找不到任务里程碑数据"
+
err
.
Error
())
...
...
@@ -975,8 +979,13 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map
}
resultList
:=
[]
adapter
.
TaskRecordAdapter
{}
nowDay
:=
time
.
Now
()
.
Format
(
"2006-01-02"
)
for
_
,
val
:=
range
taskRecordList
{
// 跳过今天
createdAtDay
:=
val
.
CreatedAt
.
Local
()
.
Format
(
"2006-01-02"
)
if
createdAtDay
==
nowDay
{
continue
}
item
:=
adapter
.
TaskRecordAdapter
{
Id
:
val
.
Id
,
StaffAssessId
:
val
.
StaffAssessId
,
...
...
@@ -995,7 +1004,7 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map
PlanCompletedAt
:
""
,
RealCompletedAt
:
""
,
},
CreatedAt
:
val
.
CreatedAt
.
Local
()
.
Format
(
"2006-01-02"
)
,
CreatedAt
:
createdAtDay
,
}
t1
:=
time
.
Unix
(
val
.
TaskStageCheck
.
PlanCompletedAt
,
0
)
.
Local
()
.
Format
(
"2006-01-02"
)
item
.
TaskStageCheck
.
PlanCompletedAt
=
t1
...
...
@@ -1190,6 +1199,7 @@ func (srv TaskService) ListTask3(param *command.SearchTaskCommand) (map[string]i
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"统计任务里程碑总数"
+
err
.
Error
())
}
//反馈异常数
taskAnomalyCnt
,
err
:=
taskDao
.
CountTaskAnomalyNotHrbp
(
condition
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"统计任务里程碑总数"
+
err
.
Error
())
...
...
pkg/infrastructure/dao/task_dao.go
查看文件 @
06eeeb9
...
...
@@ -462,7 +462,7 @@ func (d *TaskDao) TaskAnomalyByLeader(leaderId []string, anomaly int) ([]TaskDat
return
result
,
err
}
// 统计任务异常的数量,以非hrbp角色统计
// 统计任务
反馈
异常的数量,以非hrbp角色统计
func
(
d
*
TaskDao
)
CountTaskAnomalyNotHrbp
(
param
ListTaskCondition
)
(
int
,
error
)
{
task1
:=
d
.
catchTaskIdByPermission
(
param
.
UserId
)
withSql
:=
task1
+
` select count(*)
...
...
@@ -487,7 +487,7 @@ func (d *TaskDao) CountTaskAnomalyNotHrbp(param ListTaskCondition) (int, error)
return
cnt
,
err
}
// 统计任务异常的数量,以hrbp角色统计
// 统计任务
反馈
异常的数量,以hrbp角色统计
func
(
d
*
TaskDao
)
CountTaskAnomalyByHrbp
(
param
ListTaskCondition
)
(
int
,
error
)
{
withSql
:=
`with
t_task_ignore as (
...
...
pkg/infrastructure/repository/pg_task_repository.go
查看文件 @
06eeeb9
...
...
@@ -130,7 +130,9 @@ func (repo *TaskRepository) Find(queryOptions map[string]interface{}) (int, []*d
if
val
,
ok
:=
queryOptions
[
"companyId"
];
ok
{
query
.
Where
(
"task.company_id = ?"
,
val
)
}
if
val
,
ok
:=
queryOptions
[
"id"
];
ok
{
query
.
Where
(
"task.id=?"
,
val
)
}
if
val
,
ok
:=
queryOptions
[
"leaderId"
];
ok
{
query
.
Where
(
"task.leader->>'id'=?"
,
val
)
}
...
...
请
注册
或
登录
后发表评论