更新

@@ -8,10 +8,10 @@ import (
 
 
 func TestGenerateToken(t *testing.T) {
 func TestGenerateToken(t *testing.T) {
 	ut := UserAuth{
 	ut := UserAuth{
-		CompanyId:  8,
-		UserId:     3422174102828544,
-		Phone:      "17708397664",
-		PlatformId: 28,
+		CompanyId:  1,
+		UserId:     3245763368183552,
+		Phone:      "18650060951",
+		PlatformId: 29,
 		AdminType:  1,
 		AdminType:  1,
 	}
 	}
 	tk, _ := ut.CreateAccessToken()
 	tk, _ := ut.CreateAccessToken()

@@ -1397,6 +1397,7 @@ func (d *StaffAssessDao) SearchAssessSelfContentRemark(projectId int, targetUser
 	and staff_assess.deleted_at isnull 
 	and staff_assess.deleted_at isnull 
 	and staff_assess_content.category =?
 	and staff_assess_content.category =?
 	and staff_assess_content."name" = ?
 	and staff_assess_content."name" = ?
+	and staff_assess."types" ='self'
 	and staff_assess_content.level_value =?
 	and staff_assess_content.level_value =?
 	and staff_assess.evaluation_project_id=?
 	and staff_assess.evaluation_project_id=?
 	and target_user ->>'userId'='?'
 	and target_user ->>'userId'='?'

@@ -299,14 +299,22 @@ func (d *StaffAssessDao) ListTargetUserNoInvite(companyId int, cycleId int, begi
 }
 }
 
 
 type UserSelfStaffAssess struct {
 type UserSelfStaffAssess struct {
-	CycleId               string `pg:"cycle_id"`
 	AssessId              string                `pg:"assess_id"`
 	AssessId              string                `pg:"assess_id"`
-	TargetUserId          string `pg:"target_user_id"`
-	TargetUserName        string `pg:"target_user_name"`
-	EvaluationProjectId   string `pg:"evaluation_project_id"`
-	EvaluationProjectName string `pg:"evaluation_project_name"`
-	CompanyId             string `pg:"company_id"`
-	BeginDay              string `pg:"begin_day"`
+	EvaluationProjectName string                `pg:"evaluation_project_name"` //项目名称
+	CompanyId             string                `pg:"company_id"`              //公司id
+	ContentId             int                   `pg:"content_id"`              //
+	TargetUserId          string                `pg:"target_user_id"`          //被评估人的id
+	TargetUserName        string                `pg:"target_user_name"`        //被评估人的名称
+	BeginDay              string                `pg:"begin_day"`               //评估的日期
+	EvaluationProjectId   string                `pg:"evaluation_project_id"`   //项目id
+	Value                 string                `pg:"value"`                   //评估填写的值
+	LevelValue            string                `pg:"level_value"`             //评级的值
+	Rule                  domain.EvaluationRule `pg:"rule"`                    //规则
+	SortBy                int                   `pg:"sort_by"`                 //评估项顺序
+	Category              string                `pg:"category"`                //评估项分类
+	ContentName           string                `pg:"content_name"`            //评估项名称
+	Weight                float64               `pg:"weight"`                  //权重
+	CycleId               string                `pg:"cycle_id"`                //周期id
 }
 }
 
 
 type SearchConditin3 struct {
 type SearchConditin3 struct {

+-- 数据修复
+UPDATE
+    summary_evaluation
+SET
+    "status" = 'completed'
+WHERE
+    id = 389;
+