allied-creation / performance · 提交

转到一个项目

作者 郑周
提交 57892a0fa75f0b4cea9ca4abc49a509def6ad787 2 个父辈 0a174808 777cf16f

Merge branch 'dev-zhengzhou' into test

内嵌 并排对比
正在显示 2 个修改的文件 包含 14 行增加 和 14 行删除
@@ -13,17 +13,17 @@ import ( @@ -13,17 +13,17 @@ import (
13 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/infrastructure/dao" 13 "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/infrastructure/dao"
14 ) 14 )
15 15
16 -type SummaryEvaluationServeice struct { 16 +type SummaryEvaluationService struct {
17 } 17 }
18 18
19 -func NewSummaryEvaluationServeice() *SummaryEvaluationServeice {  
20 - newService := &SummaryEvaluationServeice{} 19 +func NewSummaryEvaluationService() *SummaryEvaluationService {
  20 + newService := &SummaryEvaluationService{}
21 return newService 21 return newService
22 } 22 }
23 23
24 // GetExecutorCycleList 24 // GetExecutorCycleList
25 // 获取评估执行人可用的周期列表 25 // 获取评估执行人可用的周期列表
26 -func (srv *SummaryEvaluationServeice) GetExecutorCycleList(param *command.QueryCycleList) (map[string]interface{}, error) { 26 +func (srv *SummaryEvaluationService) GetExecutorCycleList(param *command.QueryCycleList) (map[string]interface{}, error) {
27 transactionContext, err := factory.CreateTransactionContext(nil) 27 transactionContext, err := factory.CreateTransactionContext(nil)
28 if err != nil { 28 if err != nil {
29 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 29 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -71,7 +71,7 @@ func (srv *SummaryEvaluationServeice) GetExecutorCycleList(param *command.QueryC @@ -71,7 +71,7 @@ func (srv *SummaryEvaluationServeice) GetExecutorCycleList(param *command.QueryC
71 71
72 // GetMenu 72 // GetMenu
73 // 根据周期获取菜单显示 73 // 根据周期获取菜单显示
74 -func (srv *SummaryEvaluationServeice) GetMenu(param *command.QueryMenu) (map[string]interface{}, error) { 74 +func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[string]interface{}, error) {
75 transactionContext, err := factory.CreateTransactionContext(nil) 75 transactionContext, err := factory.CreateTransactionContext(nil)
76 if err != nil { 76 if err != nil {
77 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 77 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -241,7 +241,7 @@ func (srv *SummaryEvaluationServeice) GetMenu(param *command.QueryMenu) (map[str @@ -241,7 +241,7 @@ func (srv *SummaryEvaluationServeice) GetMenu(param *command.QueryMenu) (map[str
241 } 241 }
242 242
243 // buildSummaryItemValue 将填写值填充进评估项 243 // buildSummaryItemValue 将填写值填充进评估项
244 -func (srv *SummaryEvaluationServeice) buildSummaryItemValue(itemList []*domain.EvaluationItemUsed, valueList []*domain.SummaryEvaluationValue) ( 244 +func (srv *SummaryEvaluationService) buildSummaryItemValue(itemList []*domain.EvaluationItemUsed, valueList []*domain.SummaryEvaluationValue) (
245 itemValues []adapter.EvaluationItemAdapter) { 245 itemValues []adapter.EvaluationItemAdapter) {
246 itemValues = []adapter.EvaluationItemAdapter{} 246 itemValues = []adapter.EvaluationItemAdapter{}
247 valueMap := map[int]*domain.SummaryEvaluationValue{} 247 valueMap := map[int]*domain.SummaryEvaluationValue{}
@@ -278,7 +278,7 @@ func (srv *SummaryEvaluationServeice) buildSummaryItemValue(itemList []*domain.E @@ -278,7 +278,7 @@ func (srv *SummaryEvaluationServeice) buildSummaryItemValue(itemList []*domain.E
278 } 278 }
279 279
280 // 获取综合自评详情 280 // 获取综合自评详情
281 -func (srv *SummaryEvaluationServeice) GetEvaluationSelf(param *command.QueryEvaluationInfo) (*adapter.EvaluationInfoAdapter, error) { 281 +func (srv *SummaryEvaluationService) GetEvaluationSelf(param *command.QueryEvaluationInfo) (*adapter.EvaluationInfoAdapter, error) {
282 transactionContext, err := factory.CreateTransactionContext(nil) 282 transactionContext, err := factory.CreateTransactionContext(nil)
283 if err != nil { 283 if err != nil {
284 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 284 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -350,7 +350,7 @@ func (srv *SummaryEvaluationServeice) GetEvaluationSelf(param *command.QueryEval @@ -350,7 +350,7 @@ func (srv *SummaryEvaluationServeice) GetEvaluationSelf(param *command.QueryEval
350 } 350 }
351 351
352 // 编辑综合自评详情 352 // 编辑综合自评详情
353 -func (srv *SummaryEvaluationServeice) EditEvaluationSelf(param *command.EditEvaluationValue) (map[string][]adapter.EvaluationItemAdapter, error) { 353 +func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvaluationValue) (map[string][]adapter.EvaluationItemAdapter, error) {
354 transactionContext, err := factory.CreateTransactionContext(nil) 354 transactionContext, err := factory.CreateTransactionContext(nil)
355 if err != nil { 355 if err != nil {
356 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 356 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -459,7 +459,7 @@ func (srv *SummaryEvaluationServeice) EditEvaluationSelf(param *command.EditEval @@ -459,7 +459,7 @@ func (srv *SummaryEvaluationServeice) EditEvaluationSelf(param *command.EditEval
459 459
460 // GetTargetUserCycleList 460 // GetTargetUserCycleList
461 // 获取周期列表，被评估的周期列表 461 // 获取周期列表，被评估的周期列表
462 -func (srv *SummaryEvaluationServeice) GetTargetUserCycleList(param *command.QueryCycleList) (map[string]interface{}, error) { 462 +func (srv *SummaryEvaluationService) GetTargetUserCycleList(param *command.QueryCycleList) (map[string]interface{}, error) {
463 transactionContext, err := factory.CreateTransactionContext(nil) 463 transactionContext, err := factory.CreateTransactionContext(nil)
464 if err != nil { 464 if err != nil {
465 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 465 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -13,7 +13,7 @@ type SummaryEvaluationController struct { @@ -13,7 +13,7 @@ type SummaryEvaluationController struct {
13 } 13 }
14 14
15 func (c *SummaryEvaluationController) GetExecutorCycleList() { 15 func (c *SummaryEvaluationController) GetExecutorCycleList() {
16 - srv := service.NewSummaryEvaluationServeice() 16 + srv := service.NewSummaryEvaluationService()
17 paramReq := &command.QueryCycleList{} 17 paramReq := &command.QueryCycleList{}
18 err := c.BindJSON(paramReq) 18 err := c.BindJSON(paramReq)
19 if err != nil { 19 if err != nil {
@@ -28,7 +28,7 @@ func (c *SummaryEvaluationController) GetExecutorCycleList() { @@ -28,7 +28,7 @@ func (c *SummaryEvaluationController) GetExecutorCycleList() {
28 } 28 }
29 29
30 func (c *SummaryEvaluationController) GetMenu() { 30 func (c *SummaryEvaluationController) GetMenu() {
31 - srv := service.NewSummaryEvaluationServeice() 31 + srv := service.NewSummaryEvaluationService()
32 paramReq := &command.QueryMenu{} 32 paramReq := &command.QueryMenu{}
33 err := c.BindJSON(paramReq) 33 err := c.BindJSON(paramReq)
34 if err != nil { 34 if err != nil {
@@ -45,7 +45,7 @@ func (c *SummaryEvaluationController) GetMenu() { @@ -45,7 +45,7 @@ func (c *SummaryEvaluationController) GetMenu() {
45 } 45 }
46 46
47 func (c *SummaryEvaluationController) GetEvaluationSelf() { 47 func (c *SummaryEvaluationController) GetEvaluationSelf() {
48 - srv := service.NewSummaryEvaluationServeice() 48 + srv := service.NewSummaryEvaluationService()
49 paramReq := &command.QueryEvaluationInfo{} 49 paramReq := &command.QueryEvaluationInfo{}
50 err := c.BindJSON(paramReq) 50 err := c.BindJSON(paramReq)
51 if err != nil { 51 if err != nil {
@@ -62,7 +62,7 @@ func (c *SummaryEvaluationController) GetEvaluationSelf() { @@ -62,7 +62,7 @@ func (c *SummaryEvaluationController) GetEvaluationSelf() {
62 } 62 }
63 63
64 func (c *SummaryEvaluationController) EditEvaluationSelf() { 64 func (c *SummaryEvaluationController) EditEvaluationSelf() {
65 - srv := service.NewSummaryEvaluationServeice() 65 + srv := service.NewSummaryEvaluationService()
66 paramReq := &command.EditEvaluationValue{} 66 paramReq := &command.EditEvaluationValue{}
67 err := c.BindJSON(paramReq) 67 err := c.BindJSON(paramReq)
68 if err != nil { 68 if err != nil {
@@ -79,7 +79,7 @@ func (c *SummaryEvaluationController) EditEvaluationSelf() { @@ -79,7 +79,7 @@ func (c *SummaryEvaluationController) EditEvaluationSelf() {
79 } 79 }
80 80
81 func (c *SummaryEvaluationController) GetTargetUserCycleList() { 81 func (c *SummaryEvaluationController) GetTargetUserCycleList() {
82 - srv := service.NewSummaryEvaluationServeice() 82 + srv := service.NewSummaryEvaluationService()
83 paramReq := &command.QueryCycleList{} 83 paramReq := &command.QueryCycleList{}
84 err := c.BindJSON(paramReq) 84 err := c.BindJSON(paramReq)
85 if err != nil { 85 if err != nil {