作者 郑周

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

... ... @@ -1057,6 +1057,7 @@ func (srv StaffAssessServeice) getAssessSelfInfoUncompleted(transactionContext a
ritem := domain.AssessContemtRemark{
Title: vv.Title,
HintText: vv.HintText,
Definition: vv.Definition,
RemarkText: "",
}
remarks = append(remarks, ritem)
... ... @@ -1696,14 +1697,12 @@ func (srv StaffAssessServeice) SaveAssessInfo(param *command.SaveAssessInfoComma
continue
}
v.Value = item.Value
if len(item.Value) > 0 {
//填入评估值描述
reteResult, err := v.Rule.ScoreOrRating(&v.Value)
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
}
v.ReteResult = reteResult
//填入评估值描述
reteResult, err := v.Rule.ScoreOrRating(&v.Value)
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
}
v.ReteResult = reteResult
for ii := range v.Remark {
for _, vvv := range item.Remark {
if v.Remark[ii].Title == vvv.Title {
... ...
... ... @@ -24,6 +24,7 @@ type StaffAssessContent struct {
type AssessContemtRemark struct {
Title string `json:"title"` //comment:"填写标题"
HintText string `json:"hintText"` // comment:"文本内容提示"
Definition string `json:"definition"` //comment:"定义"
RemarkText string `json:"remarkText"` // comment:"填写文本内容"
}
... ...