allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 24bfe40f46ad8d23abc5aae02e2112ca43dda691 1 个父辈 46c0db1c

评估填写的值的结构

内嵌 并排对比
正在显示 5 个修改的文件 包含 11 行增加 和 1 行删除
@@ -91,6 +91,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -91,6 +91,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
91 newItemValue.SetBlankValue(evaluationSuper, val) 91 newItemValue.SetBlankValue(evaluationSuper, val)
92 newItemValue.Remark = itemValueParam[val.Id].Remark 92 newItemValue.Remark = itemValueParam[val.Id].Remark
93 evaluationSuper.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value) 93 evaluationSuper.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
  94 + newItemValue.HrCheck = param.ExecutorId
94 newSuperItemValueList = append(newSuperItemValueList, &newItemValue) 95 newSuperItemValueList = append(newSuperItemValueList, &newItemValue)
95 temp = newItemValue 96 temp = newItemValue
96 } 97 }
@@ -99,6 +100,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -99,6 +100,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
99 newItemValue.SetBlankValue(evalutionHrbp, val) 100 newItemValue.SetBlankValue(evalutionHrbp, val)
100 newItemValue.Remark = itemValueParam[val.Id].Remark 101 newItemValue.Remark = itemValueParam[val.Id].Remark
101 evalutionHrbp.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value) 102 evalutionHrbp.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
  103 + newItemValue.HrCheck = param.ExecutorId
102 newHrbpItemValueList = append(newHrbpItemValueList, &newItemValue) 104 newHrbpItemValueList = append(newHrbpItemValueList, &newItemValue)
103 temp = newItemValue 105 temp = newItemValue
104 } 106 }
@@ -113,6 +115,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit @@ -113,6 +115,7 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
113 newItemValue.SetBlankValue(evaluation360, val) 115 newItemValue.SetBlankValue(evaluation360, val)
114 newItemValue.Remark = itemValueParam[val.Id].Remark 116 newItemValue.Remark = itemValueParam[val.Id].Remark
115 evaluation360.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value) 117 evaluation360.FillItemValue(val, &newItemValue, itemValueParam[val.Id].Value)
  118 + newItemValue.HrCheck = param.ExecutorId
116 itemValue360List = append(itemValue360List, &newItemValue) 119 itemValue360List = append(itemValue360List, &newItemValue)
117 new360ItemValueList[evaluation360.Executor.UserId] = itemValue360List 120 new360ItemValueList[evaluation360.Executor.UserId] = itemValue360List
118 temp = newItemValue 121 temp = newItemValue
@@ -22,7 +22,7 @@ type SummaryEvaluationValue struct { @@ -22,7 +22,7 @@ type SummaryEvaluationValue struct {
22 Rating RatingLevel `json:"rating"` //评级时的填写值 22 Rating RatingLevel `json:"rating"` //评级时的填写值
23 CreatedAt time.Time `json:"createdAt"` //数据创建时间 23 CreatedAt time.Time `json:"createdAt"` //数据创建时间
24 UpdatedAt time.Time `json:"updatedAt"` //数据更新时间 24 UpdatedAt time.Time `json:"updatedAt"` //数据更新时间
25 - Version string `json:"version"` 25 + HrCheck int `json:"hrCheck"` // >0:代表是人资稽查填写的评估
26 } 26 }
27 27
28 type SummaryEvaluationValueRepository interface { 28 type SummaryEvaluationValueRepository interface {
@@ -45,6 +45,7 @@ func (itemValue *SummaryEvaluationValue) SetBlankValue(evaluation *SummaryEvalua @@ -45,6 +45,7 @@ func (itemValue *SummaryEvaluationValue) SetBlankValue(evaluation *SummaryEvalua
45 itemValue.CreatedAt = time.Now() 45 itemValue.CreatedAt = time.Now()
46 itemValue.UpdatedAt = time.Now() 46 itemValue.UpdatedAt = time.Now()
47 itemValue.Executor = evaluation.Executor 47 itemValue.Executor = evaluation.Executor
  48 + itemValue.HrCheck = 0
48 } 49 }
49 50
50 // 自评 填充评估的内容的规则 51 // 自评 填充评估的内容的规则
@@ -21,4 +21,5 @@ type SummaryEvaluationValue struct { @@ -21,4 +21,5 @@ type SummaryEvaluationValue struct {
21 Remark string //填写的内容反馈 21 Remark string //填写的内容反馈
22 CreatedAt time.Time //数据创建时间 22 CreatedAt time.Time //数据创建时间
23 UpdatedAt time.Time //数据更新时间 23 UpdatedAt time.Time //数据更新时间
  24 + HrCheck int // >0:代表是人资稽查填写的评估
24 } 25 }
@@ -35,6 +35,7 @@ func (repo *SummaryEvaluationValueRepository) TransformToDomain(d *models.Summar @@ -35,6 +35,7 @@ func (repo *SummaryEvaluationValueRepository) TransformToDomain(d *models.Summar
35 Rating: d.Rating, 35 Rating: d.Rating,
36 CreatedAt: d.CreatedAt, 36 CreatedAt: d.CreatedAt,
37 UpdatedAt: d.UpdatedAt, 37 UpdatedAt: d.UpdatedAt,
  38 + HrCheck: d.HrCheck,
38 } 39 }
39 } 40 }
40 41
@@ -52,6 +53,7 @@ func (repo *SummaryEvaluationValueRepository) Save(param *domain.SummaryEvaluati @@ -52,6 +53,7 @@ func (repo *SummaryEvaluationValueRepository) Save(param *domain.SummaryEvaluati
52 Remark: param.Remark, 53 Remark: param.Remark,
53 CreatedAt: param.CreatedAt, 54 CreatedAt: param.CreatedAt,
54 UpdatedAt: param.UpdatedAt, 55 UpdatedAt: param.UpdatedAt,
  56 + HrCheck: param.HrCheck,
55 } 57 }
56 db := repo.transactionContext.PgTx 58 db := repo.transactionContext.PgTx
57 if m.Id == 0 { 59 if m.Id == 0 {
  1 +ALTER TABLE public.summary_evaluation
  2 + ADD "version" varchar NOT NULL DEFAULT 'v1'::character varying;
  3 +