正在显示
2 个修改的文件
包含
8 行增加
和
1 行删除
@@ -67,7 +67,7 @@ func sendSummaryEvaluation(project *domain.EvaluationProject, | @@ -67,7 +67,7 @@ func sendSummaryEvaluation(project *domain.EvaluationProject, | ||
67 | } | 67 | } |
68 | } | 68 | } |
69 | //确定360评估的执行人 | 69 | //确定360评估的执行人 |
70 | - _, itemList, err := evaluationItemRepo.Find(map[string]interface{}{"evaluationProjectId": project.Id}) | 70 | + _, itemList, err := evaluationItemRepo.Find(map[string]interface{}{"evaluationProjectId": project.Id, "nodeType": int(domain.LinkNodeSelfAssessment)}) |
71 | if err != nil { | 71 | if err != nil { |
72 | return nil, err | 72 | return nil, err |
73 | } | 73 | } |
@@ -3,6 +3,7 @@ package service | @@ -3,6 +3,7 @@ package service | ||
3 | import ( | 3 | import ( |
4 | "errors" | 4 | "errors" |
5 | "fmt" | 5 | "fmt" |
6 | + "strings" | ||
6 | "time" | 7 | "time" |
7 | 8 | ||
8 | "github.com/linmadan/egglib-go/core/application" | 9 | "github.com/linmadan/egglib-go/core/application" |
@@ -1530,6 +1531,7 @@ func (srv *SummaryEvaluationService) editEvaluationValue( | @@ -1530,6 +1531,7 @@ func (srv *SummaryEvaluationService) editEvaluationValue( | ||
1530 | } | 1531 | } |
1531 | //填入填写的更新值 | 1532 | //填入填写的更新值 |
1532 | for _, v := range updatedValue { | 1533 | for _, v := range updatedValue { |
1534 | + v.Value = strings.TrimSpace(v.Value) | ||
1533 | newItemValue, ok := evaluationValueMap[v.EvaluationItemId] | 1535 | newItemValue, ok := evaluationValueMap[v.EvaluationItemId] |
1534 | if !ok { | 1536 | if !ok { |
1535 | continue | 1537 | continue |
@@ -1538,6 +1540,11 @@ func (srv *SummaryEvaluationService) editEvaluationValue( | @@ -1538,6 +1540,11 @@ func (srv *SummaryEvaluationService) editEvaluationValue( | ||
1538 | if !ok { | 1540 | if !ok { |
1539 | continue | 1541 | continue |
1540 | } | 1542 | } |
1543 | + if evaluationItem.Required == domain.NodeRequiredYes { | ||
1544 | + if len(v.Value) == 0 { | ||
1545 | + return fmt.Errorf("%s-%s 是必填项", evaluationItem.Category, evaluationItem.Name) | ||
1546 | + } | ||
1547 | + } | ||
1541 | //填充评估填写值 | 1548 | //填充评估填写值 |
1542 | err := newItemValue.FillValue(evaluationItem, v.Value, v.Remark) | 1549 | err := newItemValue.FillValue(evaluationItem, v.Value, v.Remark) |
1543 | if err != nil { | 1550 | if err != nil { |
-
请 注册 或 登录 后发表评论