调整任务反馈的展示内容

@@ -8,8 +8,7 @@ type TaskRecordAdapter struct {
 	TaskName       string    `json:"taskName" `             //comment:"任务名称"
 	TaskName       string    `json:"taskName" `             //comment:"任务名称"
 	TaskAlias      string    `json:"taskAlias" `            //comment:"任务别名"
 	TaskAlias      string    `json:"taskAlias" `            //comment:"任务别名"
 	TaskLeader     string    `json:"taskLeader"`            //comment:"任务负责人"
 	TaskLeader     string    `json:"taskLeader"`            //comment:"任务负责人"
-	AssistLevel    int       `json:"assistLevel" `          //comment:"上级辅导情况"
-	AssistContent  string    `json:"assistContent" `        //comment:"上级辅导内容"
+	AssistContent  string    `json:"assistContent" `        //comment:"反馈内容"
 	TaskStageCheck TaskStage `json:"taskStageCheck" `       //comment:"提交的里程碑"
 	TaskStageCheck TaskStage `json:"taskStageCheck" `       //comment:"提交的里程碑"
 	CreatedAt      string    `json:"createdAt" `            //格式2006-01-02comment:"创建时间"
 	CreatedAt      string    `json:"createdAt" `            //格式2006-01-02comment:"创建时间"
 	AnomalyState   int       `json:"anomalyState"`          //
 	AnomalyState   int       `json:"anomalyState"`          //

@@ -950,6 +950,9 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map
 	taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{
 	taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
 		"transactionContext": transactionContext,
 	})
 	})
+	assessContentRepo := factory.CreateStaffAssessContentRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
 	cnt, taskRecordList, err := taskRecordRepo.Find(map[string]interface{}{
 	cnt, taskRecordList, err := taskRecordRepo.Find(map[string]interface{}{
 		"companyId": param.CompanyId,
 		"companyId": param.CompanyId,
 		"taskId":    param.TaskId,
 		"taskId":    param.TaskId,
@@ -970,8 +973,7 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map
 			TaskName:      val.TaskName,
 			TaskName:      val.TaskName,
 			TaskAlias:     val.TaskAlias,
 			TaskAlias:     val.TaskAlias,
 			TaskLeader:    val.TaskLeader.Name,
 			TaskLeader:    val.TaskLeader.Name,
-			AssistLevel:   val.AssistLevel,
-			AssistContent: val.AssistContent,
+			AssistContent: "",
 			AnomalyState:  val.AnomalyState,
 			AnomalyState:  val.AnomalyState,
 			TaskStageCheck: adapter.TaskStage{
 			TaskStageCheck: adapter.TaskStage{
 				Id:                val.Id,
 				Id:                val.Id,
@@ -989,6 +991,19 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map
 			t2 := time.Unix(val.TaskStageCheck.RealCompletedAt, 0).Local().Format("2006-01-02")
 			t2 := time.Unix(val.TaskStageCheck.RealCompletedAt, 0).Local().Format("2006-01-02")
 			item.TaskStageCheck.RealCompletedAt = t2
 			item.TaskStageCheck.RealCompletedAt = t2
 		}
 		}
+		_, contentList, err := assessContentRepo.Find(map[string]interface{}{
+			"staffAssessId": val.StaffAssessId,
+			"category":      val.TaskCategory,
+			"name":          val.TaskName,
+		})
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取评估反馈数据"+err.Error())
+		}
+		if len(contentList) > 0 {
+			for _, val2 := range contentList[0].Remark {
+				item.AssistContent = val2.RemarkText + "\n"
+			}
+		}
 		resultList = append(resultList, item)
 		resultList = append(resultList, item)
 	}
 	}
 	result := tool_funs.SimpleWrapGridMap(int64(cnt), resultList)
 	result := tool_funs.SimpleWrapGridMap(int64(cnt), resultList)

@@ -128,7 +128,12 @@ func (repo *StaffAssessContentRepository) Find(queryOptions map[string]interface
 	if v, ok := queryOptions["staffAssessId"]; ok {
 	if v, ok := queryOptions["staffAssessId"]; ok {
 		query.Where("staff_assess_id=?", v)
 		query.Where("staff_assess_id=?", v)
 	}
 	}
-
+	if v, ok := queryOptions["category"]; ok {
+		query.Where("category=?", v)
+	}
+	if v, ok := queryOptions["name"]; ok {
+		query.Where("name=?", v)
+	}
 	query.Order("sort_by ASC")
 	query.Order("sort_by ASC")
 	count, err := query.SelectAndCount()
 	count, err := query.SelectAndCount()
 	if err != nil {
 	if err != nil {