...
|
...
|
@@ -73,7 +73,7 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont |
|
|
return application.ThrowError(application.INTERNAL_SERVER_ERROR, "查询任务失败:"+err.Error())
|
|
|
}
|
|
|
if cnt > 0 {
|
|
|
//TODO
|
|
|
|
|
|
//任务已存在
|
|
|
return nil
|
|
|
}
|
...
|
...
|
@@ -172,11 +172,11 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand) (map[string] |
|
|
defer func() {
|
|
|
_ = transactionContext.RollbackTransaction()
|
|
|
}()
|
|
|
if len(param.StageList) < 3 {
|
|
|
return map[string]interface{}{
|
|
|
"id": param.Id,
|
|
|
}, application.ThrowError(application.INTERNAL_SERVER_ERROR, "里程碑数量至少3个")
|
|
|
}
|
|
|
// if len(param.StageList) < 3 {
|
|
|
// return map[string]interface{}{
|
|
|
// "id": param.Id,
|
|
|
// }, application.ThrowError(application.INTERNAL_SERVER_ERROR, "里程碑数量至少3个")
|
|
|
// }
|
|
|
if len(param.StageList) > 5 {
|
|
|
return map[string]interface{}{
|
|
|
"id": param.Id,
|
...
|
...
|
@@ -212,31 +212,15 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand) (map[string] |
|
|
var relatedUser []*domain.User
|
|
|
if len(relatedUserIds) > 0 {
|
|
|
_, relatedUser, err = userRepo.Find(map[string]interface{}{
|
|
|
"ids": relatedUserIds,
|
|
|
"ids": relatedUserIds,
|
|
|
"companyId": param.CompanyId,
|
|
|
})
|
|
|
if err != nil {
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取任务的相关人员"+err.Error())
|
|
|
}
|
|
|
}
|
|
|
_, leaderList, err := userRepo.Find(map[string]interface{}{
|
|
|
"id": taskData.Leader.Id,
|
|
|
})
|
|
|
if err != nil {
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "查询人员失败:"+err.Error())
|
|
|
}
|
|
|
if len(leaderList) == 0 {
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "没有查询到人员")
|
|
|
}
|
|
|
leaderData := leaderList[0]
|
|
|
//更新相关人员
|
|
|
taskData.RelatedUser = []int{int(leaderData.Id)}
|
|
|
if leaderData.ParentId != 0 {
|
|
|
taskData.RelatedUser = append(taskData.RelatedUser, int(leaderData.ParentId))
|
|
|
}
|
|
|
taskData.RelatedUser = []int{}
|
|
|
for _, val := range relatedUser {
|
|
|
if val.Id == leaderData.Id || val.Id == leaderData.ParentId {
|
|
|
continue
|
|
|
}
|
|
|
taskData.RelatedUser = append(taskData.RelatedUser, int(val.Id))
|
|
|
}
|
|
|
//更新任务名称
|
...
|
...
|
@@ -323,7 +307,7 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand) (map[string] |
|
|
messageRepo := factory.CreateMessagePersonalRepository(map[string]interface{}{
|
|
|
"transactionContext": transactionContext,
|
|
|
})
|
|
|
//更具markStage 记录的里程碑数据生成通知
|
|
|
//根据markStage 记录的里程碑数据生成通知
|
|
|
for _, val := range markStage {
|
|
|
for _, val2 := range taskData.RelatedUser {
|
|
|
t1 := time.Unix(val.PlanCompletedAt, 0).Format("2006-01-02")
|
...
|
...
|
|