更新

@@ -2,8 +2,8 @@ package query
 
 
 // 查询评估的执行人
 // 查询评估的执行人
 type ListExecutorQuery struct {
 type ListExecutorQuery struct {
-	CycleId   int    `json:"cycleId"`  //周期id
-	BeginDay  string `json:"beginDay"` //日期 2006-01-02
-	Types     string `json:"types"`    // 评估类型 自评：self;上级：super;360评估：invite
+	CycleId   int    `json:"cycleId,string"` //周期id
+	BeginDay  string `json:"beginDay"`       //日期 2006-01-02
+	Types     string `json:"types"`          // 评估类型 自评：self;上级：super;360评估：360；360邀请：invite
 	CompanyId int    `json:"-"`
 	CompanyId int    `json:"-"`
 }
 }

@@ -1304,10 +1304,9 @@ func (srv StaffAssessServeice) ListExcutorUncompleted(param *query.ListExecutorQ
 		condition["typesList"] = []string{string(domain.AssessSelf)}
 		condition["typesList"] = []string{string(domain.AssessSelf)}
 	case "super":
 	case "super":
 		condition["typesList"] = []string{string(domain.AssessSuper)}
 		condition["typesList"] = []string{string(domain.AssessSuper)}
-	case "invite":
+	case "360":
 		condition["typesList"] = []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)}
 		condition["typesList"] = []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)}
 	}
 	}
-
 	_, assessList, err := assessReps.Find(condition)
 	_, assessList, err := assessReps.Find(condition)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())

@@ -307,6 +307,11 @@ func (c *StaffAssessController) ExportUserAssess2() {
 		c.Response(nil, e)
 		c.Response(nil, e)
 		return
 		return
 	}
 	}
+	if len(paramReq.ExportUserId) == 0 {
+		e := application.ThrowError(application.ARG_ERROR, "请选择人员进行绩效下载")
+		c.Response(nil, e)
+		return
+	}
 	userReq := middlewares.GetUser(c.Ctx)
 	userReq := middlewares.GetUser(c.Ctx)
 	paramReq.CompanyId = int(userReq.CompanyId)
 	paramReq.CompanyId = int(userReq.CompanyId)
 	paramReq.OperatorId = int(userReq.UserId)
 	paramReq.OperatorId = int(userReq.UserId)
@@ -356,6 +361,7 @@ func (c *StaffAssessController) GetStaffAsessSelfCountLevel() {
 	c.Response(data, err)
 	c.Response(data, err)
 }
 }
 
 
+// 获取未完成评估任务的执行人员名单
 func (c *StaffAssessController) ListExcutorUncompleted() {
 func (c *StaffAssessController) ListExcutorUncompleted() {
 	srv := service.NewStaffAssessServeice()
 	srv := service.NewStaffAssessServeice()
 	paramReq := &query.ListExecutorQuery{}
 	paramReq := &query.ListExecutorQuery{}