切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
572ed14f63025ca61d5f4a54caead100feb01cf3
1 个父辈
b8a212bd
调整每日弹窗的查询
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
34 行增加
和
20 行删除
pkg/application/notify/service/message_personal.go
pkg/infrastructure/dao/task_dao.go
pkg/infrastructure/repository/pg_message_personal_repository.go
pkg/application/notify/service/message_personal.go
查看文件 @
572ed14
...
...
@@ -122,9 +122,11 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G
messageRepo
:=
factory
.
CreateMessagePersonalRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
nowDay
:=
time
.
Now
()
.
Format
(
"2006-01-02"
)
cnt
,
_
,
err
:=
messageRepo
.
Find
(
map
[
string
]
interface
{}{
"types"
:
domain
.
MessageTypesTaskStage
,
"targetUserId"
:
param
.
UserId
,
"createdAtDay"
:
nowDay
,
"limit"
:
1
,
})
if
err
!=
nil
{
...
...
@@ -331,9 +333,11 @@ func (srv *MessagePersonalService) TodayMessageTaskRecordAnomaly(param *command.
messageRepo
:=
factory
.
CreateMessagePersonalRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
nowDay
:=
time
.
Now
()
.
Format
(
"2006-01-02"
)
cnt
,
_
,
err
:=
messageRepo
.
Find
(
map
[
string
]
interface
{}{
"types"
:
domain
.
MessageTypesTaskRecord
,
"targetUserId"
:
param
.
UserId
,
"createdAtDay"
:
nowDay
,
"limit"
:
1
,
})
if
err
!=
nil
{
...
...
pkg/infrastructure/dao/task_dao.go
查看文件 @
572ed14
...
...
@@ -408,17 +408,21 @@ type TaskData3 struct {
// 根据负责人获取超期未完成的异常的里程碑任务
func
(
d
*
TaskDao
)
TaskStageAnomalyByLeader
(
leaderId
[]
string
)
([]
TaskData3
,
error
)
{
sqlStr
:=
`select distinct
task.id as task_id,
task.leader ->>'name' as leader_name,
task.leader ->>'id' as leader_id,
task.alias as task_alias,
task.name as task_name
from task
join task_stage on task.id=task_stage.task_id
where 1=1
and task_stage.real_completed_at=0 and task_stage.plan_completed_at<extract(epoch from now())
and task.leader ->>'id' in(?) `
sqlStr
:=
`select
task.id as task_id,
task."name" as task_name ,
task.alias as task_alias,
task.leader ->>'id' as leader_id,
task.leader ->>'name' as leader_name
from task where 1=1
and task.deleted_at isnull
and (
task.last_stage ->>'planCompletedAt'< task.last_stage ->>'realCompletedAt'
or
cast(COALESCE(task.current_stage ->>'plan_completed_at','0') as int) between 1 and floor(extract(epoch from now()))
)
and task.leader ->>'id' in(?) `
result
:=
[]
TaskData3
{}
tx
:=
d
.
transactionContext
.
PgTx
_
,
err
:=
tx
.
Query
(
&
result
,
sqlStr
,
pg
.
In
(
leaderId
))
...
...
@@ -427,17 +431,20 @@ func (d *TaskDao) TaskStageAnomalyByLeader(leaderId []string) ([]TaskData3, erro
// 根据任务相关人获取超期未完成的异常的里程碑任务
func
(
d
*
TaskDao
)
TaskStageAnomalyByRelatedUser
(
relatedUserId
int
)
([]
TaskData3
,
error
)
{
sqlStr
:=
`select
distinct
sqlStr
:=
`select
task.id as task_id,
task.leader ->>'name' as leader_name,
task.leader ->>'id' as leader_id,
task."name" as task_name ,
task.alias as task_alias,
task.name as task_name
from task
join task_stage on task.id=task_stage.task_id
where 1=1
and task_stage.real_completed_at=0 and task_stage.plan_completed_at<extract(epoch from now())
and task.related_user @>? `
task.leader ->>'id' as leader_id,
task.leader ->>'name' as leader_name
from task where 1=1
and task.deleted_at isnull
and (
task.last_stage ->>'planCompletedAt'< task.last_stage ->>'realCompletedAt'
or
cast(COALESCE(task.current_stage ->>'plan_completed_at','0') as int) between 1 and floor(extract(epoch from now()))
)
and task.related_user @>? `
relatedUser
:=
fmt
.
Sprintf
(
"[%d]"
,
relatedUserId
)
result
:=
[]
TaskData3
{}
...
...
pkg/infrastructure/repository/pg_message_personal_repository.go
查看文件 @
572ed14
...
...
@@ -73,6 +73,9 @@ func (repo *MessagePersonalRepository) Find(param map[string]interface{}) (int,
if
v
,
ok
:=
param
[
"payload"
];
ok
{
query
.
Where
(
"payload @>?"
,
v
)
}
if
v
,
ok
:=
param
[
"createdAtDay"
];
ok
{
query
.
Where
(
"to_char(created_at at time zone 'PRC' ,'YYYY-MM-DD')=?"
,
v
)
}
query
.
Order
(
"id desc"
)
count
,
err
:=
query
.
SelectAndCount
()
if
err
!=
nil
{
...
...
请
注册
或
登录
后发表评论