合并分支 'test' 到 'master'

Test



查看合并请求 !9

@@ -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)})

@@ -2,7 +2,9 @@ package command
 
 
 //保存员工填写评估内容
 //保存员工填写评估内容
 type SaveAssessInfoCommand struct {
 type SaveAssessInfoCommand struct {
-	AssessId      int              `json:"assessId"`
+	AssessId      int              `json:"assessId"`   //
+	ExecutorId    int              `json:"executorId"` //填写人的id
+	CompanyId     int              `json:"companyId"`  //公司id
 	AssessContent []AssesssContent `json:"assessContent"`
 	AssessContent []AssesssContent `json:"assessContent"`
 }
 }
 
 

@@ -208,11 +208,8 @@ func (srv StaffAssessServeice) AssessTaskDesc(param *query.AssessTaskDescQuery)
 				}
 				}
 			}
 			}
 		}
 		}
-		//未参与的，不算在个人的评估环节里
-		if stepItem.Status != "" {
 		result.StepList = append(result.StepList, stepItem)
 		result.StepList = append(result.StepList, stepItem)
 	}
 	}
-	}
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
@@ -1299,7 +1296,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssess(param *query.ListInviteU
 
 
 		switch v.Types {
 		switch v.Types {
 		case domain.AssessInviteDiffSuper:
 		case domain.AssessInviteDiffSuper:
-			m["typs"] = "不同上级同事"
+			m["types"] = "不同上级同事"
 		case domain.AssessInviteSameSuper:
 		case domain.AssessInviteSameSuper:
 			m["types"] = "相同上级同事"
 			m["types"] = "相同上级同事"
 		}
 		}
@@ -1598,6 +1595,12 @@ func (srv *StaffAssessServeice) getStaffDescrip(transactionContext application.T
 	departmentRepo := factory.CreateDepartmentRepository(map[string]interface{}{
 	departmentRepo := factory.CreateDepartmentRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
 		"transactionContext": transactionContext,
 	})
 	})
+	// //查找员工的部门
+	// var departmentList []*domain.Department
+	// if len(userData.DepartmentId) > 0 {
+
+	// }
+
 	var supperUserList []*domain.User
 	var supperUserList []*domain.User
 	if len(userData.DepartmentId) > 0 {
 	if len(userData.DepartmentId) > 0 {
 		_, departmentList, err := departmentRepo.Find(map[string]interface{}{
 		_, departmentList, err := departmentRepo.Find(map[string]interface{}{
@@ -1659,7 +1662,13 @@ func (srv StaffAssessServeice) SaveAssessInfo(param *command.SaveAssessInfoComma
 	if endTimeInt < time.Now().Unix() {
 	if endTimeInt < time.Now().Unix() {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, "当前环节已过截止时间，提交后无法修改内容")
 		return nil, application.ThrowError(application.BUSINESS_ERROR, "当前环节已过截止时间，提交后无法修改内容")
 	}
 	}
-
+	//检查执行人
+	if assessData.CompanyId != param.CompanyId {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, "当前用户不是评估的执行人")
+	}
+	if assessData.Executor.UserId != param.ExecutorId {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, "当前用户不是评估的执行人")
+	}
 	assessContentRepo := factory.CreateStaffAssessContentRepository(map[string]interface{}{
 	assessContentRepo := factory.CreateStaffAssessContentRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
 		"transactionContext": transactionContext,
 	})
 	})
@@ -1763,3 +1772,78 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA
 
 
 	return tool_funs.SimpleWrapGridMap(int64(cnt), assessList), nil
 	return tool_funs.SimpleWrapGridMap(int64(cnt), assessList), nil
 }
 }
+
+//获取员工的上级是谁 ，TODO
+func (srv StaffAssessServeice) getStaffSuper(transactionContext application.TransactionContext, targetUser domain.User) ([]domain.User, error) {
+	departmentRepo := factory.CreateDepartmentRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
+	userRepo := factory.CreateUserRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
+
+	var departmemtList []*domain.Department
+	var err error
+	if len(targetUser.DepartmentId) > 0 {
+		_, departmemtList, err = departmentRepo.Find(map[string]interface{}{
+			"ids": targetUser.DepartmentId,
+		})
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的部门列表"+err.Error())
+		}
+	}
+	if len(departmemtList) == 0 {
+
+	}
+	//获取部门管理员
+	var chargeUserIds []int64
+	var targetUserAsManager *domain.Department
+loop:
+	for _, v := range departmemtList {
+		if len(v.ChargeUserIds) == 0 {
+			continue
+		}
+		//检查员工自身是否是管理员
+		for _, vv := range v.ChargeUserIds {
+			if vv == targetUser.Id {
+				targetUserAsManager = v
+				break loop
+			}
+		}
+		chargeUserIds = append(chargeUserIds, v.ChargeUserIds...)
+	}
+	if targetUserAsManager != nil {
+		//清空原有的管理员
+		chargeUserIds = []int64{}
+		//员工自身是否是管理员，查找父级部门
+		_, parentDepartment, err := departmentRepo.Find(map[string]interface{}{
+			"id": targetUserAsManager.ParentId,
+		})
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工现在部门的父级"+err.Error())
+		}
+		for _, v := range parentDepartment {
+			chargeUserIds = append(chargeUserIds, v.ChargeUserIds...)
+		}
+	}
+
+	var chargeUserList []*domain.User
+	if len(chargeUserIds) > 0 {
+		_, chargeUserList, err = userRepo.Find(map[string]interface{}{
+			"ids": chargeUserIds,
+		})
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取主管员工数据"+err.Error())
+		}
+	}
+	if len(chargeUserList) == 0 {
+		//如果都找不到数据
+
+	}
+
+	// _, chargeUserList, err := userRepo.Find(map[string]interface{}{
+	// 	"ids": chargeUserIds,
+	// })
+
+	return nil, nil
+}

@@ -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 评估内容

@@ -11,6 +11,7 @@ type PerformanceApplicationForm struct {
 	Weight        string //权重
 	Weight        string //权重
 	Standard      string //标准
 	Standard      string //标准
 	Task          string //任务、指标
 	Task          string //任务、指标
+	Definition    string //定义
 }
 }
 
 
 type PerformanceDimension struct {
 type PerformanceDimension struct {
@@ -27,6 +28,7 @@ type PerformanceModule struct {
 
 
 type PerformanceTarget struct {
 type PerformanceTarget struct {
 	Task       string `json:"task"`
 	Task       string `json:"task"`
+	Definition string `json:"definition"`
 }
 }
 
 
 func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error) {
 func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error) {
@@ -59,6 +61,10 @@ func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error)
 			taskName = "填写自评反馈"
 			taskName = "填写自评反馈"
 		}
 		}
 		form.Task = taskName
 		form.Task = taskName
+		//定义
+		if len(item) > 5 {
+			form.Definition = strings.TrimSpace(item[5])
+		}
 		//权重
 		//权重
 		if len(item) > 6 && item[6] != "" {
 		if len(item) > 6 && item[6] != "" {
 			weightName = item[6]
 			weightName = item[6]
@@ -199,7 +205,7 @@ func getStandard(items []*PerformanceApplicationForm) (string, error) {
 func getTasks(items []*PerformanceApplicationForm) ([]*PerformanceTarget, error) {
 func getTasks(items []*PerformanceApplicationForm) ([]*PerformanceTarget, error) {
 	tasks := make([]*PerformanceTarget, 0)
 	tasks := make([]*PerformanceTarget, 0)
 	for _, item := range items {
 	for _, item := range items {
-		target := &PerformanceTarget{Task: item.Task}
+		target := &PerformanceTarget{Task: item.Task, Definition: item.Definition}
 		tasks = append(tasks, target)
 		tasks = append(tasks, target)
 	}
 	}
 	return tasks, nil
 	return tasks, nil

@@ -41,7 +41,10 @@ func (controller *ImportController) Import() {
 	formType := controller.GetString("type")
 	formType := controller.GetString("type")
 	switch formType {
 	switch formType {
 	case "PerformanceDimension":
 	case "PerformanceDimension":
-		dimensions, _ := domain.LoadPerformanceDimensions(rows)
+		dimensions, err := domain.LoadPerformanceDimensions(rows)
+		if err != nil {
+			controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
+		}
 		list := controller.parseTemplateNodeContent(dimensions)
 		list := controller.parseTemplateNodeContent(dimensions)
 		controller.Response(tool_funs.SimpleWrapGridMap(int64(len(list)), list), nil)
 		controller.Response(tool_funs.SimpleWrapGridMap(int64(len(list)), list), nil)
 	default:
 	default:
@@ -105,6 +108,7 @@ func (controller *ImportController) parseTemplateNodeContent(data []*domain.Perf
 				nc.EntryItems = append(nc.EntryItems, &domain.EntryItem{
 				nc.EntryItems = append(nc.EntryItems, &domain.EntryItem{
 					Title:      target.Task,       // 输入型标题
 					Title:      target.Task,       // 输入型标题
 					HintText:   "",                // 输入项提示文本
 					HintText:   "",                // 输入项提示文本
+					Definition: target.Definition, //定义
 				})
 				})
 			}
 			}
 			// 没有任何输入项时，默认1个
 			// 没有任何输入项时，默认1个

@@ -237,6 +237,9 @@ func (c *StaffAssessController) SaveAssessInfo() {
 		c.Response(nil, e)
 		c.Response(nil, e)
 		return
 		return
 	}
 	}
+	userReq := middlewares.GetUser(c.Ctx)
+	paramReq.ExecutorId = int(userReq.UserId)
+	paramReq.CompanyId = int(userReq.CompanyId)
 	data, err := srv.SaveAssessInfo(paramReq)
 	data, err := srv.SaveAssessInfo(paramReq)
 	c.Response(data, err)
 	c.Response(data, err)
 }
 }