allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 f5041ab1c67787f520eb031ae0230859fed475d9 1 个父辈 c33ed551

修复 问题，评估内容 未顺利保存。

内嵌 并排对比
正在显示 5 个修改的文件 包含 9 行增加 和 8 行删除
@@ -110,8 +110,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -110,8 +110,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
110 if evalutionHrbp != nil && val.EvaluatorId == -1 { 110 if evalutionHrbp != nil && val.EvaluatorId == -1 {
111 newItemValue := domain.SummaryEvaluationValue{} 111 newItemValue := domain.SummaryEvaluationValue{}
112 newItemValue.SetBlankValue(evalutionHrbp, val) 112 newItemValue.SetBlankValue(evalutionHrbp, val)
113 - newItemValue.Remark = itemValueParam[val.Id].Remark  
114 evalutionHrbp.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value) 113 evalutionHrbp.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
  114 + newItemValue.Remark = itemValueParam[val.Id].Remark
115 newItemValue.HrCheck = param.ExecutorId 115 newItemValue.HrCheck = param.ExecutorId
116 newHrbpItemValueList = append(newHrbpItemValueList, &newItemValue) 116 newHrbpItemValueList = append(newHrbpItemValueList, &newItemValue)
117 temp = newItemValue 117 temp = newItemValue
@@ -126,8 +126,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -126,8 +126,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
126 } 126 }
127 newItemValue := domain.SummaryEvaluationValue{} 127 newItemValue := domain.SummaryEvaluationValue{}
128 newItemValue.SetBlankValue(evaluation360, val) 128 newItemValue.SetBlankValue(evaluation360, val)
129 - newItemValue.Remark = itemValueParam[val.Id].Remark  
130 evaluation360.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value) 129 evaluation360.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
  130 + newItemValue.Remark = itemValueParam[val.Id].Remark
131 newItemValue.HrCheck = param.ExecutorId 131 newItemValue.HrCheck = param.ExecutorId
132 itemValue360List = append(itemValue360List, &newItemValue) 132 itemValue360List = append(itemValue360List, &newItemValue)
133 new360ItemValueList[evaluation360.Executor.UserId] = itemValue360List 133 new360ItemValueList[evaluation360.Executor.UserId] = itemValue360List
@@ -138,8 +138,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -138,8 +138,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
138 if evaluationSuper != nil { 138 if evaluationSuper != nil {
139 newItemValue := domain.SummaryEvaluationValue{} 139 newItemValue := domain.SummaryEvaluationValue{}
140 newItemValue.SetBlankValue(evaluationSuper, val) 140 newItemValue.SetBlankValue(evaluationSuper, val)
141 - newItemValue.Remark = itemValueParam[val.Id].Remark  
142 evaluationSuper.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value) 141 evaluationSuper.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
  142 + newItemValue.Remark = itemValueParam[val.Id].Remark
143 newItemValue.HrCheck = param.ExecutorId 143 newItemValue.HrCheck = param.ExecutorId
144 newSuperItemValueList = append(newSuperItemValueList, &newItemValue) 144 newSuperItemValueList = append(newSuperItemValueList, &newItemValue)
145 temp = newItemValue 145 temp = newItemValue
@@ -148,8 +148,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -148,8 +148,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
148 if evalutionFinish != nil { 148 if evalutionFinish != nil {
149 newItemValue := domain.SummaryEvaluationValue{} 149 newItemValue := domain.SummaryEvaluationValue{}
150 newItemValue.SetBlankValue(evalutionFinish, val) 150 newItemValue.SetBlankValue(evalutionFinish, val)
151 - newItemValue.Remark = itemValueParam[val.Id].Remark  
152 evalutionFinish.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value) 151 evalutionFinish.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
  152 + newItemValue.Remark = itemValueParam[val.Id].Remark
153 newItemValue.HrCheck = param.ExecutorId 153 newItemValue.HrCheck = param.ExecutorId
154 newFinishItemValueList = append(newFinishItemValueList, &newItemValue) 154 newFinishItemValueList = append(newFinishItemValueList, &newItemValue)
155 } 155 }
@@ -233,11 +233,12 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua @@ -233,11 +233,12 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua
233 } 233 }
234 } 234 }
235 //填充评估填写值 235 //填充评估填写值
236 - newItemValue.Remark = v.Remark 236 +
237 err := summaryEvaluation.FillItemValue(evaluationItem, newItemValue, v.Value) 237 err := summaryEvaluation.FillItemValue(evaluationItem, newItemValue, v.Value)
238 if err != nil { 238 if err != nil {
239 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 239 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
240 } 240 }
  241 + newItemValue.Remark = v.Remark
241 } 242 }
242 summaryEvaluation.EvaluationTotalScore(evaluationValueSlice) 243 summaryEvaluation.EvaluationTotalScore(evaluationValueSlice)
243 } 244 }
@@ -360,11 +360,11 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu @@ -360,11 +360,11 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu
360 } 360 }
361 } 361 }
362 //填充评估填写值 362 //填充评估填写值
363 - newItemValue.Remark = v.Remark  
364 err := summaryEvaluation.FillItemValue(evaluationItem, newItemValue, v.Value) 363 err := summaryEvaluation.FillItemValue(evaluationItem, newItemValue, v.Value)
365 if err != nil { 364 if err != nil {
366 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 365 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
367 } 366 }
  367 + newItemValue.Remark = v.Remark
368 } 368 }
369 summaryEvaluation.EvaluationTotalScore(evaluationValueSlice) 369 summaryEvaluation.EvaluationTotalScore(evaluationValueSlice)
370 } 370 }
@@ -309,11 +309,11 @@ func (srv *SummaryEvaluationService) EditEvaluationSelfV2(param *command.EditEva @@ -309,11 +309,11 @@ func (srv *SummaryEvaluationService) EditEvaluationSelfV2(param *command.EditEva
309 } 309 }
310 } 310 }
311 //填充评估填写值 311 //填充评估填写值
312 - newItemValue.Remark = v.Remark  
313 err := evaluationData.FillItemValue(evaluationItem, newItemValue, v.Value) 312 err := evaluationData.FillItemValue(evaluationItem, newItemValue, v.Value)
314 if err != nil { 313 if err != nil {
315 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 314 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
316 } 315 }
  316 + newItemValue.Remark = v.Remark
317 } 317 }
318 evaluationData.EvaluationTotalScore(evaluationValueSlice) 318 evaluationData.EvaluationTotalScore(evaluationValueSlice)
319 } 319 }
@@ -412,11 +412,11 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval @@ -412,11 +412,11 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval
412 } 412 }
413 } 413 }
414 //填充评估填写值 414 //填充评估填写值
415 - newItemValue.Remark = v.Remark  
416 err := evaluationData.FillItemValue(evaluationItem, newItemValue, v.Value) 415 err := evaluationData.FillItemValue(evaluationItem, newItemValue, v.Value)
417 if err != nil { 416 if err != nil {
418 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 417 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
419 } 418 }
  419 + newItemValue.Remark = v.Remark
420 } 420 }
421 // 填入固定的默认值 421 // 填入固定的默认值
422 for _, v := range hrbpOr360ItemValue { 422 for _, v := range hrbpOr360ItemValue {