allied-creation / performance · 提交

转到一个项目

作者 郑周
提交 969b314a77c0cd578f8ccba665f6669d15807257 2 个父辈 c0ba137c 60700047

Merge remote-tracking branch 'origin/test' into test

内嵌 并排对比
正在显示 4 个修改的文件 包含 5 行增加 和 0 行删除
@@ -1055,6 +1055,7 @@ func (srv StaffAssessServeice) getAssessSelfInfoUncompleted(transactionContext a @@ -1055,6 +1055,7 @@ func (srv StaffAssessServeice) getAssessSelfInfoUncompleted(transactionContext a
1055 Value: "", 1055 Value: "",
1056 ReteResult: "", 1056 ReteResult: "",
1057 CreatedAt: nowTime, 1057 CreatedAt: nowTime,
  1058 + Weight: v.Weight,
1058 UpdatedAt: nowTime, 1059 UpdatedAt: nowTime,
1059 DeletedAt: nil, 1060 DeletedAt: nil,
1060 // Rule: , 1061 // Rule: ,
@@ -15,6 +15,7 @@ type StaffAssessContent struct { @@ -15,6 +15,7 @@ type StaffAssessContent struct {
15 Value string `json:"value"` //评估填写的值 15 Value string `json:"value"` //评估填写的值
16 ReteResult string `json:"reteResult"` //评估的结果 16 ReteResult string `json:"reteResult"` //评估的结果
17 Rule EvaluationRule `json:"rule"` //评估的选项规则 17 Rule EvaluationRule `json:"rule"` //评估的选项规则
  18 + Weight int `json:"weight" ` //"权重"
18 CreatedAt time.Time `json:"createdAt"` //数据创建时间 19 CreatedAt time.Time `json:"createdAt"` //数据创建时间
19 UpdatedAt time.Time `json:"updatedAt"` //数据更新时间 20 UpdatedAt time.Time `json:"updatedAt"` //数据更新时间
20 DeletedAt *time.Time `json:"deletedAt"` 21 DeletedAt *time.Time `json:"deletedAt"`
@@ -20,6 +20,7 @@ type StaffAssessContent struct { @@ -20,6 +20,7 @@ type StaffAssessContent struct {
20 ReteResult string //评估的结果 20 ReteResult string //评估的结果
21 Rule domain.EvaluationRule 21 Rule domain.EvaluationRule
22 Remark []domain.AssessContemtRemark 22 Remark []domain.AssessContemtRemark
  23 + Weight int //权重
23 CreatedAt time.Time //数据创建时间 24 CreatedAt time.Time //数据创建时间
24 UpdatedAt time.Time //数据更新时间 25 UpdatedAt time.Time //数据更新时间
25 DeletedAt *time.Time 26 DeletedAt *time.Time
@@ -34,6 +34,7 @@ func (repo *StaffAssessContentRepository) TransformToDomain(d *models.StaffAsses @@ -34,6 +34,7 @@ func (repo *StaffAssessContentRepository) TransformToDomain(d *models.StaffAsses
34 Value: d.Value, 34 Value: d.Value,
35 ReteResult: d.ReteResult, 35 ReteResult: d.ReteResult,
36 Rule: d.Rule, 36 Rule: d.Rule,
  37 + Weight: d.Weight,
37 CreatedAt: d.CreatedAt, 38 CreatedAt: d.CreatedAt,
38 UpdatedAt: d.UpdatedAt, 39 UpdatedAt: d.UpdatedAt,
39 DeletedAt: nil, 40 DeletedAt: nil,
@@ -55,6 +56,7 @@ func (repo *StaffAssessContentRepository) Save(d *domain.StaffAssessContent) (*d @@ -55,6 +56,7 @@ func (repo *StaffAssessContentRepository) Save(d *domain.StaffAssessContent) (*d
55 Rule: d.Rule, 56 Rule: d.Rule,
56 CreatedAt: d.CreatedAt, 57 CreatedAt: d.CreatedAt,
57 UpdatedAt: d.UpdatedAt, 58 UpdatedAt: d.UpdatedAt,
  59 + Weight: d.Weight,
58 DeletedAt: nil, 60 DeletedAt: nil,
59 } 61 }
60 tx := repo.transactionContext.PgTx 62 tx := repo.transactionContext.PgTx