调整周期评估查询输出

@@ -3,6 +3,7 @@ package adapter
 //综合评估的周期列表
 //综合评估的周期列表
 
 
 type CycleListAdapter struct {
 type CycleListAdapter struct {
-	CycleId   string `json:"cycleId"`   //周期id
-	CycleName string `json:"cycleName"` //
+	CycleId             string `json:"cycleId"`   //周期id
+	CycleName           string `json:"cycleName"` //
+	SummaryEvaluationId string `json:"summaryEvaluationId"`
 }
 }

@@ -14,7 +14,7 @@ type EvaluationInfoAdapter struct {
 	EndTime               string                  `json:"endTime"`                    //结束时间 2006-01-02 15:04:05
 	EndTime               string                  `json:"endTime"`                    //结束时间 2006-01-02 15:04:05
 	TargetUserId          int                     `json:"targetUserId"`               //被评估的目标用户,被执行的
 	TargetUserId          int                     `json:"targetUserId"`               //被评估的目标用户,被执行的
 	TargetUserName        string                  `json:"targetUserName"`             //
 	TargetUserName        string                  `json:"targetUserName"`             //
-	CompanyLogo           string                  `json:"companyLogo,string,"`        //公司logo
+	CompanyLogo           string                  `json:"companyLogo"`                //公司logo
 	CompanyName           string                  `json:"companyName"`                //公司名称
 	CompanyName           string                  `json:"companyName"`                //公司名称
 	SupperUser            string                  `json:"superUser"`                  //目标用户的上级
 	SupperUser            string                  `json:"superUser"`                  //目标用户的上级
 	DutyTime              string                  `json:"dutyTime"`                   //入职时间
 	DutyTime              string                  `json:"dutyTime"`                   //入职时间

@@ -530,9 +530,11 @@ func (srv *SummaryEvaluationService) GetTargetUserCycleList(param *command.Query
 	cycleList := []adapter.CycleListAdapter{}
 	cycleList := []adapter.CycleListAdapter{}
 	for _, v := range cycleData {
 	for _, v := range cycleData {
 		m := adapter.CycleListAdapter{
 		m := adapter.CycleListAdapter{
-			CycleId:   v.CycleId,
-			CycleName: v.CycleName,
+			SummaryEvaluationId: v.SummaryEvaluationId,
+			CycleId:             v.CycleId,
+			CycleName:           v.CycleName,
 		}
 		}
+
 		cycleList = append(cycleList, m)
 		cycleList = append(cycleList, m)
 	}
 	}
 	return tool_funs.SimpleWrapGridMap(int64(cnt), cycleList), nil
 	return tool_funs.SimpleWrapGridMap(int64(cnt), cycleList), nil

@@ -21,8 +21,9 @@ func NewSummaryEvaluationDao(options map[string]interface{}) *SummaryEvaluationD
 }
 }
 
 
 type PersonalCycle struct {
 type PersonalCycle struct {
-	CycleId   string `pg:"cycle_id" `  //
-	CycleName string `pg:"cycle_name"` //
+	CycleId             string `pg:"cycle_id" `             //周期id
+	CycleName           string `pg:"cycle_name"`            //周期名称
+	SummaryEvaluationId string `pg:"summary_evaluation_id"` //评估任务id
 }
 }
 
 
 // GetExecutorCycleList 获取执行人拥有的周期列表
 // GetExecutorCycleList 获取执行人拥有的周期列表
@@ -81,6 +82,7 @@ func (d *SummaryEvaluationDao) CountExecutorCycleList(executorId int, evaluation
 func (d *SummaryEvaluationDao) GetTargetUserCycleList(executorId int, offset int, limit int, evaluationType int) ([]PersonalCycle, error) {
 func (d *SummaryEvaluationDao) GetTargetUserCycleList(executorId int, offset int, limit int, evaluationType int) ([]PersonalCycle, error) {
 	sqlStr := `select  
 	sqlStr := `select  
 	distinct 
 	distinct 
+	summary_evaluation.id as summary_evaluation_id,
 	summary_evaluation.cycle_id ,
 	summary_evaluation.cycle_id ,
 	summary_evaluation.cycle_name 
 	summary_evaluation.cycle_name 
 	from summary_evaluation 
 	from summary_evaluation