作者 tangxvhui

更新 评估填写的内容添加Definition字段

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