修复一些问题

@@ -147,6 +147,7 @@ func (d *StaffAssessDao) AllAssessCycleList(companyId int) ([]AssessCycle, error
 	from  staff_assess_task 
 	from  staff_assess_task 
 	where  staff_assess_task.company_id = ?
 	where  staff_assess_task.company_id = ?
 	and staff_assess_task.deleted_at isnull
 	and staff_assess_task.deleted_at isnull
+	order by staff_assess_task.cycle_id desc
 	`
 	`
 
 
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
@@ -175,7 +176,8 @@ func (d *StaffAssessDao) AllAssessCycleDayList(companyId int, cycleId int) ([]As
 	from staff_assess_task 
 	from staff_assess_task 
 	where staff_assess_task.cycle_id = ?
 	where staff_assess_task.cycle_id = ?
 	and company_id =?
 	and company_id =?
-	and staff_assess_task.deleted_at isnull `
+	and staff_assess_task.deleted_at isnull 
+	order by staff_assess_task.begin_day desc `
 
 
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
 	condition := []interface{}{
 	condition := []interface{}{
@@ -188,17 +190,17 @@ func (d *StaffAssessDao) AllAssessCycleDayList(companyId int, cycleId int) ([]As
 
 
 //获取员工填写评估内容
 //获取员工填写评估内容
 type UserAssessContent struct {
 type UserAssessContent struct {
-	AssessId            string `json:"assessId"`
-	ContentId           int    `json:"contentId"`
-	TargetUserId        string `json:"targetUserId"`        //被评估人的id
-	TargetUserName      string `json:"targetUserName"`      //被评估人的名称
-	BeginDay            string `json:"beginDay"`            //评估的日期
-	EvaluationProjectId string `json:"evaluationProjectId"` //项目id
-	Value               string `json:"value"`               //评估填写的值
-	SortBy              int    `json:"sortBy"`              //评估项顺序
-	Category            string `json:"category"`            //评估项分类
-	ContentName         string `json:"contentName"`         //评估项名称
-	Weight              int    `json:"weight"`              //权重
+	AssessId            string  `json:"assessId"`
+	ContentId           int     `json:"contentId"`
+	TargetUserId        string  `json:"targetUserId"`        //被评估人的id
+	TargetUserName      string  `json:"targetUserName"`      //被评估人的名称
+	BeginDay            string  `json:"beginDay"`            //评估的日期
+	EvaluationProjectId string  `json:"evaluationProjectId"` //项目id
+	Value               string  `json:"value"`               //评估填写的值
+	SortBy              int     `json:"sortBy"`              //评估项顺序
+	Category            string  `json:"category"`            //评估项分类
+	ContentName         string  `json:"contentName"`         //评估项名称
+	Weight              float64 `json:"weight"`              //权重
 }
 }
 
 
 type SearchConditin1 struct {
 type SearchConditin1 struct {
@@ -372,16 +374,16 @@ func (d *StaffAssessDao) useTStaffAssess(companyId int, cycleId int, userId int,
 type ExportData1 struct {
 type ExportData1 struct {
 	AssessId            string
 	AssessId            string
 	ContentId           int
 	ContentId           int
-	TargetUserId        string //被评估人的id
-	TargetUserName      string //被评估人的名称
-	BeginDay            string //评估的日期
-	EvaluationProjectId string //项目id
-	Value               string //评估填写的值
-	SortBy              int    //评估项顺序
-	Category            string //评估项分类
-	ContentName         string //评估项名称
-	Weight              int    //权重
-	PromptText          string //评估标准
+	TargetUserId        string  //被评估人的id
+	TargetUserName      string  //被评估人的名称
+	BeginDay            string  //评估的日期
+	EvaluationProjectId string  //项目id
+	Value               string  //评估填写的值
+	SortBy              int     //评估项顺序
+	Category            string  //评估项分类
+	ContentName         string  //评估项名称
+	Weight              float64 //权重
+	PromptText          string  //评估标准
 	Remark              []domain.AssessContemtRemark
 	Remark              []domain.AssessContemtRemark
 }
 }