Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/performance into test

@@ -396,12 +396,15 @@ func (rs *EvaluationProjectService) List(in *command.QueryProjectCommand) (inter
 			pmpUserIds = append(pmpUserIds, userId)
 			pmpUserIds = append(pmpUserIds, userId)
 		}
 		}
 
 
-		// 当前时间超过截至时间显示【已结束】
+		// 如果是已启用状态时，当前时间超过截至时间显示【已结束】
+		if project.State == domain.ProjectStateEnable {
 			if now > project.EndTime.Unix() {
 			if now > project.EndTime.Unix() {
 				project.State = domain.ProjectStateDisable
 				project.State = domain.ProjectStateDisable
 			}
 			}
 		}
 		}
 
 
+	}
+
 	if len(pmpUserIds) > 0 {
 	if len(pmpUserIds) > 0 {
 		userRepository := factory.CreateUserRepository(map[string]interface{}{"transactionContext": transactionContext})
 		userRepository := factory.CreateUserRepository(map[string]interface{}{"transactionContext": transactionContext})
 		_, users, _ := userRepository.Find(map[string]interface{}{"ids": pmpUserIds, "limit": len(pmpUserIds)})
 		_, users, _ := userRepository.Find(map[string]interface{}{"ids": pmpUserIds, "limit": len(pmpUserIds)})

@@ -27,6 +27,7 @@ const (
 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:"文本内容提示"`
+	Definition string `json:"definition" comment:"定义"`
 }
 }
 
 
 // NodeContent 评估内容
 // NodeContent 评估内容

@@ -107,7 +107,8 @@ func (controller *ImportController) parseTemplateNodeContent(data []*domain.Perf
 				target := module.Target[i3]
 				target := module.Target[i3]
 				nc.EntryItems = append(nc.EntryItems, &domain.EntryItem{
 				nc.EntryItems = append(nc.EntryItems, &domain.EntryItem{
 					Title:      target.Task,       // 输入型标题
 					Title:      target.Task,       // 输入型标题
-					HintText: target.Definition, // 输入项提示文本
+					HintText:   "",                // 输入项提示文本
+					Definition: target.Definition, //定义
 				})
 				})
 			}
 			}
 			// 没有任何输入项时，默认1个
 			// 没有任何输入项时，默认1个