allied-creation / performance · 提交

转到一个项目

作者 郑周
提交 c2efd87f175b29606c9df7513df9f5fd7af9c30c 2 个父辈 6ddeee6e 541dcc78

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

内嵌 并排对比
正在显示 5 个修改的文件 包含 21 行增加 和 3 行删除
不能预览此文件类型
@@ -1299,7 +1299,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU @@ -1299,7 +1299,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU
1299 1299
1300 switch v.Types { 1300 switch v.Types {
1301 case domain.AssessInviteDiffSuper: 1301 case domain.AssessInviteDiffSuper:
1302 - m["typs"] = "不同上级同事" 1302 + m["types"] = "不同上级同事"
1303 case domain.AssessInviteSameSuper: 1303 case domain.AssessInviteSameSuper:
1304 m["types"] = "相同上级同事" 1304 m["types"] = "相同上级同事"
1305 } 1305 }
@@ -27,6 +27,7 @@ const ( @@ -27,6 +27,7 @@ const (
27 type EntryItem struct { 27 type EntryItem struct {
28 Title string `json:"title" comment:"填写标题"` 28 Title string `json:"title" comment:"填写标题"`
29 HintText string `json:"hintText" comment:"文本内容提示"` 29 HintText string `json:"hintText" comment:"文本内容提示"`
  30 + Definition string `json:"definition" comment:"定义"`
30 } 31 }
31 32
32 // NodeContent 评估内容 33 // NodeContent 评估内容
@@ -11,6 +11,7 @@ type PerformanceApplicationForm struct { @@ -11,6 +11,7 @@ type PerformanceApplicationForm struct {
11 Weight string //权重 11 Weight string //权重
12 Standard string //标准 12 Standard string //标准
13 Task string //任务、指标 13 Task string //任务、指标
  14 + Definition string //定义
14 } 15 }
15 16
16 type PerformanceDimension struct { 17 type PerformanceDimension struct {
@@ -27,6 +28,7 @@ type PerformanceModule struct { @@ -27,6 +28,7 @@ type PerformanceModule struct {
27 28
28 type PerformanceTarget struct { 29 type PerformanceTarget struct {
29 Task string `json:"task"` 30 Task string `json:"task"`
  31 + Definition string `json:"definition"`
30 } 32 }
31 33
32 func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error) { 34 func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error) {
@@ -55,8 +57,14 @@ func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error) @@ -55,8 +57,14 @@ func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error)
55 //指标任务 57 //指标任务
56 if len(item) > 4 && item[4] != "" { 58 if len(item) > 4 && item[4] != "" {
57 taskName = item[4] 59 taskName = item[4]
  60 + } else {
  61 + taskName = "填写自评反馈"
58 } 62 }
59 form.Task = taskName 63 form.Task = taskName
  64 + //定义
  65 + if len(item) > 5 {
  66 + form.Definition = strings.TrimSpace(item[5])
  67 + }
60 //权重 68 //权重
61 if len(item) > 6 && item[6] != "" { 69 if len(item) > 6 && item[6] != "" {
62 weightName = item[6] 70 weightName = item[6]
@@ -66,6 +74,11 @@ func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error) @@ -66,6 +74,11 @@ func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error)
66 if len(item) > 7 && item[7] != "" { 74 if len(item) > 7 && item[7] != "" {
67 standardName = item[7] 75 standardName = item[7]
68 } 76 }
  77 + if key < len(rows)-1 {
  78 + if len(rows[key+1]) > 1 && rows[key+1][1] != "" {
  79 + standardName = ""
  80 + }
  81 + }
69 form.Standard = standardName 82 form.Standard = standardName
70 formRows = append(formRows, form) 83 formRows = append(formRows, form)
71 } 84 }
@@ -192,7 +205,7 @@ func getStandard(items []*PerformanceApplicationForm) (string, error) { @@ -192,7 +205,7 @@ func getStandard(items []*PerformanceApplicationForm) (string, error) {
192 func getTasks(items []*PerformanceApplicationForm) ([]*PerformanceTarget, error) { 205 func getTasks(items []*PerformanceApplicationForm) ([]*PerformanceTarget, error) {
193 tasks := make([]*PerformanceTarget, 0) 206 tasks := make([]*PerformanceTarget, 0)
194 for _, item := range items { 207 for _, item := range items {
195 - target := &PerformanceTarget{Task: item.Task} 208 + target := &PerformanceTarget{Task: item.Task, Definition: item.Definition}
196 tasks = append(tasks, target) 209 tasks = append(tasks, target)
197 } 210 }
198 return tasks, nil 211 return tasks, nil
@@ -41,7 +41,10 @@ func (controller *ImportController) Import() { @@ -41,7 +41,10 @@ func (controller *ImportController) Import() {
41 formType := controller.GetString("type") 41 formType := controller.GetString("type")
42 switch formType { 42 switch formType {
43 case "PerformanceDimension": 43 case "PerformanceDimension":
44 - dimensions, _ := domain.LoadPerformanceDimensions(rows) 44 + dimensions, err := domain.LoadPerformanceDimensions(rows)
  45 + if err != nil {
  46 + controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
  47 + }
45 list := controller.parseTemplateNodeContent(dimensions) 48 list := controller.parseTemplateNodeContent(dimensions)
46 controller.Response(tool_funs.SimpleWrapGridMap(int64(len(list)), list), nil) 49 controller.Response(tool_funs.SimpleWrapGridMap(int64(len(list)), list), nil)
47 default: 50 default:
@@ -105,6 +108,7 @@ func (controller *ImportController) parseTemplateNodeContent(data []*domain.Perf @@ -105,6 +108,7 @@ func (controller *ImportController) parseTemplateNodeContent(data []*domain.Perf
105 nc.EntryItems = append(nc.EntryItems, &domain.EntryItem{ 108 nc.EntryItems = append(nc.EntryItems, &domain.EntryItem{
106 Title: target.Task, // 输入型标题 109 Title: target.Task, // 输入型标题
107 HintText: "", // 输入项提示文本 110 HintText: "", // 输入项提示文本
  111 + Definition: target.Definition, //定义
108 }) 112 })
109 } 113 }
110 // 没有任何输入项时，默认1个 114 // 没有任何输入项时，默认1个