Merge branch 'feature/eta_2.6.6' into debug

controllers/assessment/assessment_variety.go

@@ -834,12 +834,12 @@ func (this *AssessmentVarietyController) ImportData() {
 	}
 	existsMapping := make(map[string]*models.AssessmentVarietyData)
 	for _, v := range existsData {
-		k := fmt.Sprintf("%s-%s", v.VarietyName, v.WeekDate.Format(utils.FormatDate))
+		k := fmt.Sprintf("%d-%s", v.VarietyId, v.WeekDate.Format(utils.FormatDate))
 		existsMapping[k] = v
 	}
 	insertData, updateData := make([]*models.AssessmentVarietyData, 0), make([]*models.AssessmentVarietyData, 0)
 	for _, v := range rowData {
-		k := fmt.Sprintf("%s-%s", v.VarietyName, v.WeekDate.Format(utils.FormatDate))
+		k := fmt.Sprintf("%d-%s", v.VarietyId, v.WeekDate.Format(utils.FormatDate))
 		exist := existsMapping[k]
 		if exist == nil {
 			insertData = append(insertData, v)