作者 郑周

1. 里程碑记录

@@ -7,6 +7,7 @@ import ( @@ -7,6 +7,7 @@ import (
7 "time" 7 "time"
8 8
9 service "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role" 9 service "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role"
  10 + taskService "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/task/service"
10 11
11 "github.com/linmadan/egglib-go/core/application" 12 "github.com/linmadan/egglib-go/core/application"
12 "github.com/linmadan/egglib-go/utils/tool_funs" 13 "github.com/linmadan/egglib-go/utils/tool_funs"
@@ -1222,7 +1223,7 @@ func (srv StaffAssessServeice) SaveSelfAssess(in *command.SaveSelfAssessCommand) @@ -1222,7 +1223,7 @@ func (srv StaffAssessServeice) SaveSelfAssess(in *command.SaveSelfAssessCommand)
1222 } 1223 }
1223 } 1224 }
1224 1225
1225 - // TODO 还差调用绪旭辉接口,更新里程碑状态 1226 + // 更新里程碑数据
1226 if len(in.AssessTaskStages) > 0 { 1227 if len(in.AssessTaskStages) > 0 {
1227 projectRepository := factory.CreateEvaluationProjectRepository(map[string]interface{}{"transactionContext": transactionContext}) 1228 projectRepository := factory.CreateEvaluationProjectRepository(map[string]interface{}{"transactionContext": transactionContext})
1228 project, err := projectRepository.FindOne(map[string]interface{}{"id": assessData.EvaluationProjectId}) 1229 project, err := projectRepository.FindOne(map[string]interface{}{"id": assessData.EvaluationProjectId})
@@ -1263,8 +1264,15 @@ func (srv StaffAssessServeice) SaveSelfAssess(in *command.SaveSelfAssessCommand) @@ -1263,8 +1264,15 @@ func (srv StaffAssessServeice) SaveSelfAssess(in *command.SaveSelfAssessCommand)
1263 } 1264 }
1264 _, err := taskRecordRepository.Insert(it) 1265 _, err := taskRecordRepository.Insert(it)
1265 if err != nil { 1266 if err != nil {
1266 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "更新里程碑数据:"+err.Error()) 1267 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "更新里程碑记录:"+err.Error())
  1268 + }
  1269 + }
1267 } 1270 }
  1271 +
  1272 + if len(taskRecords) > 0 {
  1273 + err := taskService.NewTaskService().ReplyTaskStage(transactionContext, taskRecords)
  1274 + if err != nil {
  1275 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "更新里程碑数据:"+err.Error())
1268 } 1276 }
1269 } 1277 }
1270 } 1278 }
@@ -560,12 +560,12 @@ func (srv TaskService) ListTask(param *command.ListTaskCommand) (map[string]inte @@ -560,12 +560,12 @@ func (srv TaskService) ListTask(param *command.ListTaskCommand) (map[string]inte
560 return result, nil 560 return result, nil
561 } 561 }
562 562
563 -func (t TaskService) canUpdateTask(taskData *domain.Task, stageList []*domain.TaskStage) (bool, error) { 563 +func (srv TaskService) canUpdateTask(taskData *domain.Task, stageList []*domain.TaskStage) (bool, error) {
564 return true, nil 564 return true, nil
565 } 565 }
566 566
567 // CancelAttention 用户取消关注某个任务 567 // CancelAttention 用户取消关注某个任务
568 -func (t TaskService) CancelAttention(param *command.CancelAttentionCommand) error { 568 +func (srv TaskService) CancelAttention(param *command.CancelAttentionCommand) error {
569 transactionContext, err := factory.CreateTransactionContext(nil) 569 transactionContext, err := factory.CreateTransactionContext(nil)
570 if err != nil { 570 if err != nil {
571 return application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 571 return application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -596,7 +596,7 @@ func (t TaskService) CancelAttention(param *command.CancelAttentionCommand) erro @@ -596,7 +596,7 @@ func (t TaskService) CancelAttention(param *command.CancelAttentionCommand) erro
596 } 596 }
597 597
598 // 员工绩效-任务管理-列表 598 // 员工绩效-任务管理-列表
599 -func (t TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]interface{}, error) { 599 +func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]interface{}, error) {
600 transactionContext, err := factory.CreateTransactionContext(nil) 600 transactionContext, err := factory.CreateTransactionContext(nil)
601 if err != nil { 601 if err != nil {
602 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 602 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -612,7 +612,7 @@ func (t TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]int @@ -612,7 +612,7 @@ func (t TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]int
612 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息"+err.Error()) 612 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息"+err.Error())
613 } 613 }
614 if hrbpFlag == domain.RoleTypeSystem { 614 if hrbpFlag == domain.RoleTypeSystem {
615 - listData, err := t.listTask2ForHrbp(param) 615 + listData, err := srv.listTask2ForHrbp(param)
616 return listData, err 616 return listData, err
617 } 617 }
618 var limit = 20 618 var limit = 20
@@ -699,7 +699,7 @@ func (t TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]int @@ -699,7 +699,7 @@ func (t TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]int
699 } 699 }
700 700
701 // 以hrbp角色权限获取任务列表 701 // 以hrbp角色权限获取任务列表
702 -func (t TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[string]interface{}, error) { 702 +func (srv TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[string]interface{}, error) {
703 var limit = 20 703 var limit = 20
704 var offset = 0 704 var offset = 0
705 if param.PageSize > 0 { 705 if param.PageSize > 0 {
@@ -793,7 +793,7 @@ func (t TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[str @@ -793,7 +793,7 @@ func (t TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[str
793 } 793 }
794 794
795 // ReplyTaskStage 根据每日的任务反馈 ,更新任务里程碑 795 // ReplyTaskStage 根据每日的任务反馈 ,更新任务里程碑
796 -func (t TaskService) ReplyTaskStage(transactionContext application.TransactionContext, param []*domain.TaskRecord) error { 796 +func (srv TaskService) ReplyTaskStage(transactionContext application.TransactionContext, param []*domain.TaskRecord) error {
797 taskRepo := factory.CreateTaskRepository(map[string]interface{}{ 797 taskRepo := factory.CreateTaskRepository(map[string]interface{}{
798 "transactionContext": transactionContext, 798 "transactionContext": transactionContext,
799 }) 799 })