Merge branch 'test' into dev-tangxvhui

@@ -1072,6 +1072,7 @@ func (srv StaffAssessServeice) getAssessSelfInfoUncompleted(transactionContext a
 			ReteResult:    "",
 			ReteResult:    "",
 			CreatedAt:     nowTime,
 			CreatedAt:     nowTime,
 			Weight:        v.Weight,
 			Weight:        v.Weight,
+			Required:      v.Required,
 			UpdatedAt:     nowTime,
 			UpdatedAt:     nowTime,
 			DeletedAt:     nil,
 			DeletedAt:     nil,
 			// Rule: ,
 			// Rule: ,
@@ -1725,11 +1726,13 @@ func (srv StaffAssessServeice) SaveAssessInfo(param *command.SaveAssessInfoComma
 			continue
 			continue
 		}
 		}
 		v.Value = item.Value
 		v.Value = item.Value
+		if v.Required == 1 {
 			//转换填入的评估值
 			//转换填入的评估值
 			err = v.TransformValue()
 			err = v.TransformValue()
 			if err != nil {
 			if err != nil {
 				return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 				return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 			}
 			}
+		}
 		for ii := range v.Remark {
 		for ii := range v.Remark {
 			for _, vvv := range item.Remark {
 			for _, vvv := range item.Remark {
 				if v.Remark[ii].Title == vvv.Title {
 				if v.Remark[ii].Title == vvv.Title {

@@ -172,6 +172,7 @@ func (srv StaffAssessServeice) ListUserAssessContentCycleDay(param *query.ListAs
 		}
 		}
 		changeableRows[v.TargetUserId]["targetUserName"] = v.TargetUserName
 		changeableRows[v.TargetUserId]["targetUserName"] = v.TargetUserName
 		changeableRows[v.TargetUserId]["targetUserId"] = v.TargetUserId
 		changeableRows[v.TargetUserId]["targetUserId"] = v.TargetUserId
+		changeableRows[v.TargetUserId]["assessId"] = v.AssessId
 		if v.ContentId > 0 {
 		if v.ContentId > 0 {
 			name := fmt.Sprintf("%s-%s", v.Category, v.ContentName)
 			name := fmt.Sprintf("%s-%s", v.Category, v.ContentName)
 			key := fmt.Sprintf("k%d", i)
 			key := fmt.Sprintf("k%d", i)

@@ -19,6 +19,11 @@ const (
 	LinkNodeViewResult         int = 5 // 环节-绩效结果查看
 	LinkNodeViewResult         int = 5 // 环节-绩效结果查看
 )
 )
 
 
+const (
+	NodeRequiredYes int = 1 // 是否必填项-必填（默认）
+	NodeRequiredNo  int = 2 // 是否必填项-非必填
+)
+
 type EntryItem struct {
 type EntryItem struct {
 	Title      string `json:"title" comment:"填写标题"`
 	Title      string `json:"title" comment:"填写标题"`
 	HintText   string `json:"hintText" comment:"文本内容提示"`
 	HintText   string `json:"hintText" comment:"文本内容提示"`
@@ -35,6 +40,7 @@ type NodeContent struct {
 	PromptTitle string          `json:"promptTitle" comment:"提示项标题"`
 	PromptTitle string          `json:"promptTitle" comment:"提示项标题"`
 	PromptText  string          `json:"promptText" comment:"提示项正文"`
 	PromptText  string          `json:"promptText" comment:"提示项正文"`
 	EntryItems  []*EntryItem    `json:"entryItems" comment:"填写项"`
 	EntryItems  []*EntryItem    `json:"entryItems" comment:"填写项"`
+	Required    int             `json:"required" comment:"必填项"`
 }
 }
 
 
 // LinkNode 评估流程、环节
 // LinkNode 评估流程、环节

@@ -23,6 +23,7 @@ type StaffAssessContent struct {
 	ReteResult    string                `json:"reteResult"`    //评估的结果
 	ReteResult    string                `json:"reteResult"`    //评估的结果
 	Rule          EvaluationRule        `json:"rule"`          //评估的选项规则
 	Rule          EvaluationRule        `json:"rule"`          //评估的选项规则
 	Weight        float64               `json:"weight" `       //"权重"
 	Weight        float64               `json:"weight" `       //"权重"
+	Required      int                   `json:"required"`      // 必填项
 	CreatedAt     time.Time             `json:"createdAt"`     //数据创建时间
 	CreatedAt     time.Time             `json:"createdAt"`     //数据创建时间
 	UpdatedAt     time.Time             `json:"updatedAt"`     //数据更新时间
 	UpdatedAt     time.Time             `json:"updatedAt"`     //数据更新时间
 	DeletedAt     *time.Time            `json:"deletedAt"`
 	DeletedAt     *time.Time            `json:"deletedAt"`

@@ -23,6 +23,7 @@ type StaffAssessContent struct {
 	Rule          domain.EvaluationRule
 	Rule          domain.EvaluationRule
 	Remark        []domain.AssessContemtRemark
 	Remark        []domain.AssessContemtRemark
 	Weight        float64   `pg:",use_zero"` //权重
 	Weight        float64   `pg:",use_zero"` //权重
+	Required      int       //必填项
 	CreatedAt     time.Time //数据创建时间
 	CreatedAt     time.Time //数据创建时间
 	UpdatedAt     time.Time //数据更新时间
 	UpdatedAt     time.Time //数据更新时间
 	DeletedAt     *time.Time
 	DeletedAt     *time.Time

@@ -37,6 +37,7 @@ func (repo *StaffAssessContentRepository) TransformToDomain(d *models.StaffAsses
 		ReteResult:    d.ReteResult,
 		ReteResult:    d.ReteResult,
 		Rule:          d.Rule,
 		Rule:          d.Rule,
 		Weight:        d.Weight,
 		Weight:        d.Weight,
+		Required:      d.Required,
 		CreatedAt:     d.CreatedAt,
 		CreatedAt:     d.CreatedAt,
 		UpdatedAt:     d.UpdatedAt,
 		UpdatedAt:     d.UpdatedAt,
 		DeletedAt:     nil,
 		DeletedAt:     nil,
@@ -59,6 +60,7 @@ func (repo *StaffAssessContentRepository) Save(d *domain.StaffAssessContent) (*d
 		Rule:          d.Rule,
 		Rule:          d.Rule,
 		Remark:        d.Remark,
 		Remark:        d.Remark,
 		Weight:        d.Weight,
 		Weight:        d.Weight,
+		Required:      d.Required,
 		CreatedAt:     d.CreatedAt,
 		CreatedAt:     d.CreatedAt,
 		UpdatedAt:     d.UpdatedAt,
 		UpdatedAt:     d.UpdatedAt,
 		DeletedAt:     nil,
 		DeletedAt:     nil,

@@ -120,6 +120,8 @@ func (controller *ImportController) parseTemplateNodeContent(data []*domain.Perf
 				})
 				})
 			}
 			}
 
 
+			// 必填项
+			nc.Required = domain.NodeRequiredYes
 			nodeContents = append(nodeContents, nc)
 			nodeContents = append(nodeContents, nc)
 		}
 		}
 	}
 	}