修改个人档案信息

api/version1/personnelapi/types.go

@@ -403,7 +403,7 @@ type StaffAppLevel struct {
 type JiXiaoChengji struct {
 	UserKey string `json:"userKey"`
 	Years   string `json:"years"`
-	Levels  int    `json:"levels"`
+	// Levels  int    `json:"levels"`
 }
 
 // 输出绩效成绩详情

api/version1/personnelapi/uploadFileredis.go

@@ -543,7 +543,13 @@ func (s *StaffApi) AnalysisRedisOrgStaffExelect(c *gin.Context) {
 				staffKaoPing.Userkey = myInfo.Key
 				staffKaoPing.TimeYear = requestData.Years
 				staffKaoPing.Levels = int64(requestData.Levels)
-				staffKaoPing.EvaluationItems = fenzhiAry
+				switch requestData.Levels {
+				case 2:
+					staffKaoPing.EvaluationItemss = fenzhiAry
+				default:
+					staffKaoPing.EvaluationItems = fenzhiAry
+				}
+				// staffKaoPing.EvaluationItems = fenzhiAry
 				staffKaoPing.Comment = pingyu
 				staffKaoPing.Time = time.Now().Unix()
 				err = overall.CONSTANT_DB_HR.Create(&staffKaoPing).Error
@@ -558,9 +564,17 @@ func (s *StaffApi) AnalysisRedisOrgStaffExelect(c *gin.Context) {
 				if int64(requestData.Levels) != staffKaoPing.Levels {
 					editCont["`levels`"] = requestData.Levels
 				}
-				if fenzhiAry != staffKaoPing.EvaluationItems {
+				// if fenzhiAry != staffKaoPing.EvaluationItems {
+				// 	editCont["`evaluationItems`"] = fenzhiAry
+				// }
+
+				switch requestData.Levels {
+				case 2:
+					editCont["`evaluationItemss`"] = fenzhiAry
+				default:
 					editCont["`evaluationItems`"] = fenzhiAry
 				}
+
 				if pingyu != staffKaoPing.Comment {
 					editCont["`comment`"] = pingyu
 				}
@@ -636,8 +650,16 @@ func (s *StaffApi) GainMyChengjiYears(c *gin.Context) {
 		return
 	}
 	var sendData SendStaffInfo
-	sendData.Comment = strings.Split(staffKaoPing.Comment, "#A#")
+	if staffKaoPing.Comment != "" {
+		sendData.Comment = strings.Split(staffKaoPing.Comment, "#A#")
+	}
 	scoreAry := strings.Split(staffKaoPing.EvaluationItems, ",")
+	switch staffKaoPing.Levels {
+	case 2:
+		scoreAry = strings.Split(staffKaoPing.EvaluationItemss, ",")
+	default:
+	}
+
 	var sunScore float64 = 0
 	scoreMap := make(map[int]float64)
 	for i, v := range scoreAry {

models/perstatisticsevaluators.go

@@ -7,13 +7,14 @@ import (
 
 // 行政组织变更记录
 type PerstatiSticsevaluators struct {
-	Id              int64  `json:"id" gorm:"primaryKey;column:id;type:bigint(20) unsigned;not null;comment:ID"`
+	Id               int64  `json:"id" gorm:"primaryKey;column:id;type:bigint(20) unsigned;not null;comment:ID"`
-	Userkey         int64  `json:"userkey" gorm:"primaryKey;column:userkey;type:bigint(20) unsigned;not null;comment:员工唯一识别符;"`
+	Userkey          int64  `json:"userkey" gorm:"primaryKey;column:userkey;type:bigint(20) unsigned;not null;comment:员工唯一识别符;"`
-	TimeYear        int64  `json:"timeYear" gorm:"column:timeYear;type:bigint(20) unsigned;default:0;not null;comment:考评年分"`
+	TimeYear         int64  `json:"timeYear" gorm:"column:timeYear;type:bigint(20) unsigned;default:0;not null;comment:考评年分"`
-	Levels          int64  `json:"levels" gorm:"column:levels;type:int(1) unsigned;default:1;not null;comment:考评分类"`
+	Levels           int64  `json:"levels" gorm:"column:levels;type:int(1) unsigned;default:1;not null;comment:考评分类"`
-	Time            int64  `json:"time" gorm:"column:time;type:bigint(20) unsigned;default:0;not null;comment:创建时间"`
+	Time             int64  `json:"time" gorm:"column:time;type:bigint(20) unsigned;default:0;not null;comment:创建时间"`
-	EvaluationItems string `json:"evaluationItems" gorm:"column:evaluationItems;type:varchar(255) ;comment:评估项"`
+	EvaluationItems  string `json:"evaluationItems" gorm:"column:evaluationItems;type:varchar(255) ;comment:评估项"`
-	Comment         string `json:"v" gorm:"column:comment;type:mediumtext;comment:领导评语"`
+	Comment          string `json:"v" gorm:"column:comment;type:mediumtext;comment:领导评语"`
+	EvaluationItemss string `json:"evaluationItemss" gorm:"column:evaluationItemss;type:varchar(255) ;comment:二类评估项"`
 }
 
 func (PerstatiSticsevaluators *PerstatiSticsevaluators) TableName() string {