切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
ac211ddac1358a0f2b87cb59e78aab4a842ef087
1 个父辈
2ec9c632
调整,弹窗消息输出数据
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
56 行增加
和
59 行删除
pkg/application/notify/service/message_personal.go
pkg/application/summary_evaluation/service/service2.go
pkg/infrastructure/dao/summary_evaluation_dao.go
pkg/port/beego/controllers/message_personal_controller.go
pkg/port/beego/routers/message_personal_router.go
pkg/application/notify/service/message_personal.go
查看文件 @
ac211dd
...
...
@@ -571,56 +571,56 @@ func (srv *MessagePersonalService) TodayMessageTaskAnomaly(param *command.GetUse
}
// 提醒人员去确认周期评估的成绩
func
(
srv
*
MessagePersonalService
)
SummaartEvaluationScore
(
userId
int
)
(
msg
map
[
string
]
interface
{},
err
error
)
{
msg
=
map
[
string
]
interface
{}{
"needNotify"
:
false
,
"cycleId"
:
"0"
,
"cycleName"
:
""
,
"targetUserId"
:
"0"
,
"targetUserName"
:
""
,
}
transactionContext
,
err
:=
factory
.
CreateTransactionContext
(
nil
)
if
err
!=
nil
{
return
msg
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
if
err
:=
transactionContext
.
StartTransaction
();
err
!=
nil
{
return
msg
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
defer
func
()
{
_
=
transactionContext
.
RollbackTransaction
()
}()
// func (srv *MessagePersonalService) SummaartEvaluationScore(userId int) (msg map[string]interface{}, err error) {
// msg = map[string]interface{}{
// "needNotify": false,
// "cycleId": "0",
// "cycleName": "",
// "targetUserId": "0",
// "targetUserName": "",
// }
// transactionContext, err := factory.CreateTransactionContext(nil)
// if err != nil {
// return msg, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
// }
// if err := transactionContext.StartTransaction(); err != nil {
// return msg, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
// }
// defer func() {
// _ = transactionContext.RollbackTransaction()
// }()
evaluationRepo
:=
factory
.
CreateSummaryEvaluationRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
// evaluationRepo := factory.CreateSummaryEvaluationRepository(map[string]interface{}{
// "transactionContext": transactionContext,
// })
_
,
evaluationList
,
err
:=
evaluationRepo
.
Find
(
map
[
string
]
interface
{}{
"targetUserId"
:
userId
,
"checkResult"
:
domain
.
EvaluationCheckUncompleted
,
"types"
:
5
,
})
if
err
!=
nil
{
return
msg
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
if
len
(
evaluationList
)
==
0
{
return
msg
,
nil
}
nowTime
:=
time
.
Now
()
for
_
,
val
:=
range
evaluationList
{
if
nowTime
.
After
(
val
.
EndTime
)
{
msg
=
map
[
string
]
interface
{}{
"needNotify"
:
true
,
"cycleId"
:
strconv
.
FormatInt
(
val
.
CycleId
,
10
),
"cycleName"
:
val
.
CycleName
,
"targetUserId"
:
strconv
.
Itoa
(
val
.
TargetUser
.
UserId
),
"targetUserName"
:
val
.
TargetUser
.
UserName
,
}
break
}
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
msg
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
// _, evaluationList, err := evaluationRepo.Find(map[string]interface{}{
// "targetUserId": userId,
// "checkResult": domain.EvaluationCheckUncompleted,
// "types": 5,
// })
// if err != nil {
// return msg, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
// }
// if len(evaluationList) == 0 {
// return msg, nil
// }
// nowTime := time.Now()
// for _, val := range evaluationList {
// if nowTime.After(val.EndTime) {
// msg = map[string]interface{}{
// "needNotify": true,
// "cycleId": strconv.FormatInt(val.CycleId, 10),
// "cycleName": val.CycleName,
// "targetUserId": strconv.Itoa(val.TargetUser.UserId),
// "targetUserName": val.TargetUser.UserName,
// }
// break
// }
// }
// if err := transactionContext.CommitTransaction(); err != nil {
// return msg, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
// }
return
msg
,
nil
}
// return msg, nil
// }
...
...
pkg/application/summary_evaluation/service/service2.go
查看文件 @
ac211dd
...
...
@@ -918,7 +918,11 @@ func (srv *SummaryEvaluationService) GetUnconfirmedCycleList(companyId int, user
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
var
cycleList
[]
adapter
.
CycleListAdapter
nowTime
:=
time
.
Now
()
for
_
,
v
:=
range
cycles
{
if
nowTime
.
Before
(
v
.
EndTime
)
{
continue
}
cycleList
=
append
(
cycleList
,
adapter
.
CycleListAdapter
{
CycleId
:
v
.
CycleId
,
CycleName
:
v
.
CycleName
,
...
...
pkg/infrastructure/dao/summary_evaluation_dao.go
查看文件 @
ac211dd
...
...
@@ -88,6 +88,7 @@ type TargetUserCycle struct {
CycleId
string
`pg:"cycle_id" `
//周期id
CycleName
string
`pg:"cycle_name"`
//周期名称
BeginTime
time
.
Time
`pg:"begin_time"`
EndTime
time
.
Time
`pg:"end_time"`
}
// GetExecutorCycleList 获取被评估目标人拥有的周期列表
...
...
@@ -145,6 +146,7 @@ func (d *SummaryEvaluationDao) TargetUnconfirmedCycleList(companyId int, executo
sqlStr
:=
`select
summary_evaluation.cycle_id,
summary_evaluation.begin_time,
summary_evaluation.end_time,
summary_evaluation.cycle_name
from summary_evaluation
where summary_evaluation.deleted_at isnull
...
...
pkg/port/beego/controllers/message_personal_controller.go
查看文件 @
ac211dd
...
...
@@ -49,11 +49,3 @@ func (c *MessagePersonalController) TodayMessageTaskStageModify() {
data
,
err
:=
srv
.
TodayMessageTaskStageModifyV2
(
&
param
)
c
.
Response
(
data
,
err
)
}
func
(
c
*
MessagePersonalController
)
TodayMessageSummaryEvaluationFinishScore
()
{
srv
:=
service
.
NewMessagePersonalService
()
userReq
:=
middlewares
.
GetUser
(
c
.
Ctx
)
userId
:=
int
(
userReq
.
UserId
)
data
,
err
:=
srv
.
SummaartEvaluationScore
(
userId
)
c
.
Response
(
data
,
err
)
}
...
...
pkg/port/beego/routers/message_personal_router.go
查看文件 @
ac211dd
...
...
@@ -14,7 +14,6 @@ func init() {
web
.
NSCtrlGet
(
"/summary-evaluation/task_stage/today"
,
(
*
controllers
.
MessagePersonalController
)
.
TodayMessageTaskStageAnomaly
),
web
.
NSCtrlGet
(
"/summary-evaluation/task_record/today"
,
(
*
controllers
.
MessagePersonalController
)
.
TodayMessageTaskRecordAnomaly
),
web
.
NSCtrlGet
(
"/summary-evaluation/task_modify/today"
,
(
*
controllers
.
MessagePersonalController
)
.
TodayMessageTaskStageModify
),
web
.
NSCtrlGet
(
"/summary-evaluation-finish/confim-score"
,
(
*
controllers
.
MessagePersonalController
)
.
TodayMessageSummaryEvaluationFinishScore
),
)
web
.
AddNamespace
(
ns
)
}
...
...
请
注册
或
登录
后发表评论