修改部门考核说明不显示问题

gin_server_admin/api/admin/dutyassess/assess.go

@@ -2,6 +2,7 @@ package dutyassess
 
 import (
 	"encoding/json"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -711,3 +712,284 @@ func (d *DutyAssessApi) EiteDepartForDuty(c *gin.Context) {
 
 	response.Result(0, sunTargetId, "编辑成功！", c)
 }
+
+//查看考核方案
+func (d *DutyAssessApi) LookDepartDutyVersio(c *gin.Context) {
+	var requestData LookDutyVersio
+	err := c.ShouldBindJSON(&requestData)
+	if err != nil {
+		response.Result(101, err, "数据获取失败！", c)
+		return
+	}
+	if requestData.Key == "" {
+		response.Result(102, err, "数据获取失败！", c)
+		return
+	}
+	//获取考核方案
+	var assessTargetContent assessmentmodel.PlanVersio
+
+	planVersioErr := global.GVA_DB_Performanceappraisal.Where("`key` = ?", requestData.Key).First(&assessTargetContent).Error
+	if planVersioErr != nil {
+		response.Result(103, planVersioErr, "数据获取失败！", c)
+		return
+	}
+	var uotContAry []TargetContOutCont
+	if assessTargetContent.Content != "" {
+		var planVersioInfo []AddDutyNewCont
+		jsonErr := json.Unmarshal([]byte(assessTargetContent.Content), &planVersioInfo)
+		if jsonErr == nil {
+			for _, pv := range planVersioInfo {
+				for _, pvChild := range pv.Child {
+					var uotCont TargetContOutCont
+					//集团
+					uotCont.Group = strconv.FormatInt(assessTargetContent.Group, 10)
+					where := commonus.MapOut()
+					where["id"] = assessTargetContent.Group
+					orgCont, _ := commonus.GetNewOrgCont(where, "id", "name")
+					uotCont.GroupNAme = orgCont.Name
+					//维度
+					uotCont.Id = pvChild.Id
+					uotCont.Dimension = pv.Id
+					uotCont.DimensionName = pv.Name
+					uotCont.DimensionWeight = int64(pv.ZhiFraction)
+					//指标
+					uotCont.Target = pvChild.Id
+					uotCont.TargetName = pvChild.Name
+					uotCont.TargetWeight = pvChild.ReferenceScore
+					uotCont.Unit = pvChild.Unit
+					uotCont.Content = pvChild.Content
+					uotCont.State = pvChild.State
+					//获取指标内容
+					var evalTargerCont assessmentmodel.EvaluationTarget
+					evalErr := global.GVA_DB_Performanceappraisal.Where("`et_id` = ?", pvChild.Id).First(&evalTargerCont).Error
+					if evalErr == nil {
+						uotCont.Type = evalTargerCont.Type
+						uotCont.Cycles = evalTargerCont.Cycles
+						uotCont.CycleAttres = evalTargerCont.CycleAttres
+						// if uotCont.Type == 1 {
+						// } else {
+
+						// }
+						//获取执行人
+						uotCont.UserListAry, _ = getQualEvalUser(requestData.Key, pv.Id, pvChild.Id)
+					}
+					uotCont.QualEvalId = requestData.Key
+					uotContAry = append(uotContAry, uotCont)
+				}
+			}
+		} else {
+			var uotErr bool = false
+			uotContAry, uotErr = getLookAssessQualEvalList(requestData.Key)
+			if uotErr == false {
+				response.Result(103, uotErr, "数据获取失败！", c)
+				return
+			}
+		}
+	} else {
+		var uotErr bool = false
+		uotContAry, uotErr = getLookAssessQualEvalList(requestData.Key)
+		if uotErr == false {
+			response.Result(103, uotErr, "数据获取失败！", c)
+			return
+		}
+	}
+	// var uotErr bool = false
+	// uotContAry, uotErr = getLookAssessQualEvalList(requestData.Key)
+	// if uotErr == false {
+	// 	return
+	// }
+	response.Result(0, uotContAry, "数据获取成功！", c)
+}
+
+//获取执行人
+/*
+@key				版本号码
+@dimensionId		维度
+@targetId			指标
+*/
+func getQualEvalUser(key, dimensionId, targetId string) (userContAry []QualEvalArrt, istrue bool) {
+	istrue = false
+	var qualEvalCont []assessmentmodel.QualitativeEvaluation
+	listTargetErr := global.GVA_DB_Performanceappraisal.Select("qe_operator").Where("`qe_dimension` = ? AND `qe_target` = ? AND `qe_qual_eval_id` = ?", dimensionId, targetId, key).Find(&qualEvalCont).Error
+	if listTargetErr != nil {
+		return
+	}
+	var userKey []string
+	for _, v := range qualEvalCont {
+		//判断执行人是否为空
+		if v.Operator != "" {
+			//解析执行人数值
+			userCont := strings.Split(v.Operator, ",")
+			if len(userCont) > 0 {
+				for _, uv := range userCont {
+					//判断执行人是否已经存在
+					if commonus.IsItTrueString(uv, userKey) == false {
+						userKey = append(userKey, uv)
+					}
+				}
+
+			}
+		}
+
+	}
+	//获取执行人信息
+	if len(userKey) > 0 {
+		for _, ukv := range userKey {
+			usWhere := commonus.MapOut()
+			usWhere["`key`"] = ukv
+			usCont, usErr := commonus.GetNewHrPeopleInfo(usWhere, "`number`", "`name`", "`company`", "`deparment`", "`icon`")
+			if usErr == true {
+				var userCont QualEvalArrt
+				userCont.Id = ukv
+				userCont.Name = usCont.Name
+				userCont.Icon = usCont.Icon
+
+				where := commonus.MapOut()
+				where["id"] = usCont.Company
+				orgCont, _ := commonus.GetNewOrgCont(where, "id", "name")
+				userCont.GroupName = orgCont.Name
+
+				whereDepart := commonus.MapOut()
+				whereDepart["id"] = usCont.Deparment
+				orgContDepart, _ := commonus.GetNewOrgCont(whereDepart, "id", "name")
+				userCont.DepartmentName = orgContDepart.Name
+
+				// _, groupInfo := commonus.GetGroupCont(usCont.Group)
+				// userCont.GroupName = groupInfo.Name
+				// _, bfInfo := commonus.GetBranchFactory(usCont.DepartmentId)
+				// userCont.DepartmentName = bfInfo.Name
+				userCont.Number = usCont.Number
+				userContAry = append(userContAry, userCont)
+			}
+		}
+
+	}
+	return
+}
+
+//获取部门考核项目
+func getLookAssessQualEvalList(Key string) (uotContAry []TargetContOutCont, errMsg bool) {
+	errMsg = false
+	var qualitativeEvaluationAry []assessmentmodel.QualitativeEvaluation
+	listTargetErr := global.GVA_DB_Performanceappraisal.Select("qualitative_evaluation.*,dutyclass.sort").Where("`qe_state` IN (1,2) AND `qe_qual_eval_id` = ?", Key).Joins("left join dutyclass on id = qe_dimension").Order("qe_group asc,qe_accept_evaluation asc,sort asc,qe_type asc,qe_target asc,qe_target_sun asc").Find(&qualitativeEvaluationAry).Error
+
+	if listTargetErr != nil || len(qualitativeEvaluationAry) < 1 {
+		return
+	}
+	// var uotContAry []TargetContOutCont
+	for _, v := range qualitativeEvaluationAry {
+		var uotCont TargetContOutCont
+		uotCont.Id = strconv.FormatInt(v.Id, 10)
+		uotCont.Type = v.Type
+		uotCont.Group = strconv.FormatInt(v.Group, 10)
+
+		where := commonus.MapOut()
+		where["id"] = v.Group
+		orgCont, _ := commonus.GetNewOrgCont(where, "id", "name")
+		uotCont.GroupNAme = orgCont.Name
+
+		whereDepart := commonus.MapOut()
+		whereDepart["id"] = v.AcceptEvaluation
+		orgContDepart, _ := commonus.GetNewOrgCont(whereDepart, "id", "name")
+		uotCont.DepartmentName = orgContDepart.Name
+
+		// groupErr, groupCont := commonus.GetGroupCont(v.Group)
+		// if groupErr == true {
+		// 	uotCont.GroupNAme = groupCont.Name
+		// }
+		uotCont.DepartmentId = strconv.FormatInt(v.AcceptEvaluation, 10)
+		// deparConErr, deparConCont := commonus.GetBranchFactory(v.AcceptEvaluation)
+		// if deparConErr == true {
+		// 	uotCont.DepartmentName = deparConCont.Name
+		// }
+
+		uotCont.Dimension = strconv.FormatInt(v.Dimension, 10)
+		dutyClassCont, dutyClassErr := commonus.GetDutyClassInfo(v.Dimension)
+		if dutyClassErr == true {
+			uotCont.DimensionName = dutyClassCont.Title
+		}
+		uotCont.DimensionWeight = commonus.GetDimesionTargetWeight(1, v.Group, v.AcceptEvaluation, v.Dimension, 0)
+
+		uotCont.Target = strconv.FormatInt(v.Target, 10)
+		targetInfo, targetErr := commonus.GetTargetInfo(v.Target)
+		if targetErr == true {
+			uotCont.TargetName = targetInfo.Title
+		}
+		uotCont.TargetWeight = commonus.GetDimesionTargetWeight(2, v.Group, v.AcceptEvaluation, v.Dimension, v.Target)
+		uotCont.TargetSun = strconv.FormatInt(v.TargetSun, 10)
+		info, infoErr := commonus.GetQualitativeTargetInfo(v.TargetSun)
+		if infoErr == true {
+			uotCont.TargetSunName = info.Title
+		}
+		uotCont.DetailedTarget = strconv.FormatInt(v.DetailedTarget, 10)
+		dtCont, dtIsTrue := commonus.GetDetailedTargetInfo(v.DetailedTarget)
+		if dtIsTrue == true {
+			uotCont.DetailedTargetName = dtCont.Title
+			if v.Content == "" {
+				uotCont.Content = dtCont.Content
+			} else {
+				uotCont.Content = v.Content
+			}
+
+		} else {
+			uotCont.Content = v.Content
+		}
+		uotCont.QualEvalId = v.QualEvalId
+		uotCont.Unit = v.Unit
+		uotCont.ReferenceScore = v.ReferenceScore
+		uotCont.Cycles = v.Cycles
+		uotCont.CycleAttres = v.CycleAttres
+		uotCont.State = v.State
+		userAry := strings.Split(v.Operator, ",")
+		uotCont.UserList = userAry
+		for _, u_v := range userAry {
+			// usCont, usErr := archiveapi.GetUserInfo([]string{"worker_man.wm_number", "worker_man_data.wmd_name"}, map[string]interface{}{"wm_key": u_v})
+			// if usErr == true {
+			// 	var userCont QualEvalArrt
+			// 	userCont.Id = u_v
+			// 	userCont.Name = usCont.Name
+			// 	uotCont.UserListAry = append(uotCont.UserListAry, userCont)
+			// }
+			usCont, usErr := commonus.GetWorkUser(u_v)
+			// GetWorkUser
+			if usErr == true {
+				var userCont QualEvalArrt
+				userCont.Id = u_v
+				userCont.Name = usCont.Name
+				userCont.Icon = usCont.Icon
+
+				where := commonus.MapOut()
+				where["id"] = usCont.Group
+				orgCont, _ := commonus.GetNewOrgCont(where, "id", "name")
+				userCont.GroupName = orgCont.Name
+
+				whereDepart := commonus.MapOut()
+				whereDepart["id"] = usCont.DepartmentId
+				orgContDepart, _ := commonus.GetNewOrgCont(whereDepart, "id", "name")
+				userCont.DepartmentName = orgContDepart.Name
+
+				// _, groupInfo := commonus.GetGroupCont(usCont.Group)
+				// userCont.GroupName = groupInfo.Name
+				// _, bfInfo := commonus.GetBranchFactory(usCont.DepartmentId)
+				// userCont.DepartmentName = bfInfo.Name
+				userCont.Number = usCont.Number
+				uotCont.UserListAry = append(uotCont.UserListAry, userCont)
+			}
+		}
+
+		if v.MinScore > 0 && v.MaxScore > 0 {
+			uotCont.MinOrMaxScore = fmt.Sprintf("%v-%v", float64(v.MinScore)/100, float64(v.MaxScore)/100)
+		} else if v.MinScore > 0 && v.MaxScore <= 0 {
+			uotCont.MinOrMaxScore = fmt.Sprintf("%v", float64(v.MinScore)/100)
+		} else if v.MinScore <= 0 && v.MaxScore > 0 {
+			uotCont.MinOrMaxScore = fmt.Sprintf("%v", float64(v.MaxScore)/100)
+		} else {
+			uotCont.MinOrMaxScore = "0"
+		}
+
+		uotCont.DetailedTarget = strconv.FormatInt(v.DetailedTarget, 10)
+		uotContAry = append(uotContAry, uotCont)
+	}
+	errMsg = true
+	return
+}

gin_server_admin/api/admin/dutyassess/assesstype.go

@@ -348,9 +348,9 @@ type NewOutPutDetailedTarget struct {
 type NewEiteDtyDiteCont struct {
 	GetEiteTargetCont
 	AssId       string `json:"assid"`
-	Unit        string `json:"unit"`        //单位
+	Unit        string `json:"unit"`      //单位
-	Score       string `json:"score"`       //分值
+	Score       string `json:"score"`     //分值
-	AddOrReduce int    `json:"addorreduce"` //1：减少；2：增加
+	AddOrReduce int    `json:"addreduce"` //1：减少；2：增加
 }
 
 //定量考核列表查询
@@ -572,3 +572,27 @@ type scanDutyOutList struct {
 	DepartIdMap           []string `json:"departidmap"`           //子栏目部门
 	DepartNameMap         []string `json:"departnamemap"`         //子栏目部门
 }
+
+//部门版本新考核方案输出
+type departPlanDutyOut struct {
+	Id                string         `json:"id"`              //指标ID、
+	Qualevalid        string         `json:"qualevalid"`      //版本号码
+	Group             string         `json:"group"`           //集团
+	Parentid          string         `json:"parentid"`        //部门ID
+	Parentname        string         `json:"parentname"`      //部门名称
+	Dimension         string         `json:"dimension"`       //维度ID
+	DimensionName     string         `json:"dimensionname"`   //维度名称
+	DimensionWeight   int64          `json:"dimensionweight"` //维度权重
+	Target            string         `json:"target"`          //指标ID
+	Targetname        string         `json:"targetname"`      //指标名称
+	TargetWeight      int64          `json:"targetweight"`    //指标权重
+	Unit              string         `json:"unit"`            //单位
+	Content           string         `json:"content"`         //指标说明
+	UserList          []string       `json:"userlist"`        //执行人列表
+	UserListAry       []QualEvalArrt `json:"userlistary"`     //执行人列表
+	CyclesDetTar      int            `json:"cycledettar"`     //0:无；1：班；2：天；3：周；4：月；5：季度；6：年
+	CycleDetTarAttres int            `json:"cycleattrdettar"` //辅助计数
+	CensorType        []string       `json:"censortype"`      //检查方式（1：现场检查；2：资料检查；3：事件触发）
+	CensorCont        string         `json:"censorcont"`      //检查依据
+	CensorRate        int            `json:"censorrate"`      //检查频次
+}

gin_server_admin/api/admin/dutyassess/dutyes.go

@@ -429,7 +429,7 @@ func (d *dataLockStatistics) jieXieZiLanMu(dutyAssessId, sunTargetId int64, sunC
 			gormDb = gormDb.Where("FIND_IN_SET(2,`dt_censor_type`)")
 		}
 	}
-	detaErr := gormDb.Find(&detailedList).Error
+	detaErr := gormDb.Order("dt_id DESC").Find(&detailedList).Error
 	if detaErr != nil {
 		return
 	}
@@ -482,3 +482,169 @@ func (d *dataLockStatistics) jieXieZiLanMu(dutyAssessId, sunTargetId int64, sunC
 
 	syncProcess.Done()
 }
+
+//添加 定性考核指标关系指定
+func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) {
+	var requestData AddQualEval
+	err := c.ShouldBindJSON(&requestData)
+	if err != nil {
+		// response.Result(101, err, "数据获取失败！", c)
+		// return
+	}
+	if requestData.Group == "" {
+		response.Result(102, err, "请选择归属集团", c)
+		return
+	}
+	if len(requestData.AcceptDepartmentId) <= 0 {
+		response.Result(103, err, "请选择接受考核的部门！", c)
+		return
+	}
+	if requestData.Target == "" {
+		response.Result(104, err, "请选择考核指标", c)
+		return
+	}
+	if requestData.TargetSunTitle == "" {
+		response.Result(105, err, "请输入栏目名称！", c)
+		return
+	}
+	if len(requestData.EvaluationList) <= 0 {
+		response.Result(106, err, "请添加测评详情！", c)
+		return
+	}
+	//转化接收考核部门
+	sunTarDepartStr := strings.Join(requestData.AcceptDepartmentId, ",")
+	//获取子目标情况
+	sunTargetCont, sunTargetErr := commonus.JudgeColumn(requestData.Target, requestData.TargetSun, requestData.TargetSunTitle, sunTarDepartStr)
+	if sunTargetErr != true {
+	}
+	//将集团Id转化成整型
+	groupInt, groupIntErr := strconv.ParseInt(requestData.Group, 10, 64)
+	if groupIntErr != nil {
+		groupInt = 1
+	}
+	//将集指标Id转化成整型
+	targetInt, targetIntErr := strconv.ParseInt(requestData.Target, 10, 64)
+	if targetIntErr != nil {
+		targetInt = 0
+	}
+	//将集维度Id转化成整型
+	dimensionInt, departinIntErr := strconv.ParseInt(requestData.Dimension, 10, 64)
+	if departinIntErr != nil {
+		dimensionInt = 0
+	}
+	//如果没有提交维度ID将主动去查询维度ID
+	if dimensionInt == 0 {
+		targetInfo, targetInfoErr := commonus.GetTargetInfo(targetInt)
+		if targetInfoErr == true {
+			dimensionInt = targetInfo.Dimension
+		}
+	}
+	//判断指标是否存在并且获取已存在的所有指标关联部门
+	var guanLianBuMen []string
+	for _, vvk_vs := range requestData.AcceptDepartmentId {
+		if commonus.IsItTrueString(vvk_vs, guanLianBuMen) == false {
+			guanLianBuMen = append(guanLianBuMen, vvk_vs)
+		}
+	}
+	//关联集团部门考核维度
+	commonus.AddDepartDimension(requestData.Group, strconv.FormatInt(dimensionInt, 10), requestData.Dimension, 1)
+
+	//判断该集团指标子栏目是否存在
+	var arTaegetInfo assessmentmodel.Assesstarget
+	judgeARTErr := global.GVA_DB_Performanceappraisal.Where("`group` = ? AND `dimension` = ? AND `targetid` = ? AND `suntargetid` = ?", groupInt, dimensionInt, targetInt, sunTargetCont.Id).First(&arTaegetInfo).Error
+
+	//处理指标细则
+	var targetContList []DutyAssEssTarget
+	for _, v := range requestData.EvaluationList {
+		detailedTargetInfo, dtiIsTrue := JudgeDetailsCopyEs(requestData.Target, sunTarDepartStr, sunTargetCont.Id, v)
+		if dtiIsTrue == true {
+			if detailedTargetInfo.Id != 0 {
+				var targetContInfo DutyAssEssTarget
+				targetContInfo.Id = detailedTargetInfo.Id
+				targetContInfo.Operator = v.Operator
+				targetContList = append(targetContList, targetContInfo)
+			}
+		}
+	}
+
+	//处理指标关联部门
+	var sunTarId []int64
+	judgeARkTErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Select("`suntargetid`").Where("`group` = ? AND `dimension` = ? AND `targetid` = ? ", groupInt, dimensionInt, targetInt).Find(&sunTarId).Error
+	if judgeARkTErr == nil {
+		var sunTarDepartMap []string
+		judgeSunTarkTErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Select("`q_depart`").Where("`q_id` IN ?", sunTarId).Find(&sunTarDepartMap).Error
+		if judgeSunTarkTErr == nil {
+			for _, vvk := range sunTarDepartMap {
+				departStrAry := strings.Split(vvk, ",")
+				for _, vvk_v := range departStrAry {
+					if commonus.IsItTrueString(vvk_v, guanLianBuMen) == false {
+						guanLianBuMen = append(guanLianBuMen, vvk_v)
+					}
+				}
+			}
+
+		}
+		eiteContkk := commonus.MapOut()
+		eiteContkk["departmentmap"] = strings.Join(guanLianBuMen, ",")
+		eiteContkk["time"] = time.Now().Unix()
+		global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`suntargetid` IN ?", sunTarId).Updates(eiteContkk)
+	}
+
+	if judgeARTErr == nil {
+		//存在时
+		var eiteTarList []DutyAssEssTarget
+		if arTaegetInfo.Content != "" && arTaegetInfo.Content != "null" {
+			var tarList []DutyAssEssTarget
+			jsonErr := json.Unmarshal([]byte(arTaegetInfo.Content), &tarList)
+			if jsonErr == nil {
+				for _, ttl_v := range targetContList {
+					eiteTarList = append(eiteTarList, ttl_v)
+				}
+				for _, tl_v := range tarList {
+					_, tarInfoErr := JudgeDeiScor(tl_v.Id, targetContList)
+					if tarInfoErr == false {
+						if judgeDeaimErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.DetailedTarget{}).Select("dt_id").Where("dt_state = 1 AND dt_id = ?", tl_v.Id).First(&map[string]interface{}{}).Error; judgeDeaimErr == nil {
+							eiteTarList = append(eiteTarList, tl_v)
+						}
+
+					}
+				}
+			} else {
+				eiteTarList = targetContList
+			}
+			eiteCont := commonus.MapOut()
+			eiteCont["time"] = time.Now().Unix()
+			jsonStr, jsonMErr := json.Marshal(eiteTarList)
+			if jsonMErr == nil {
+				eiteCont["content"] = string(jsonStr)
+			}
+			eiteErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`at_id` = ?", arTaegetInfo.Id).Updates(eiteCont).Error
+			if eiteErr == nil {
+				response.Result(0, err, "处理成功！1", c)
+			} else {
+				response.Result(107, err, "请添加测评详情！", c)
+			}
+		} else {
+			eiteTarList = targetContList
+		}
+	} else {
+		//不存在时
+		arTaegetInfo.Group = groupInt
+
+		arTaegetInfo.Departmentmap = strings.Join(guanLianBuMen, ",")
+		arTaegetInfo.TargetId = targetInt
+		arTaegetInfo.SunTargetId = sunTargetCont.Id
+		arTaegetInfo.Dimension = dimensionInt
+		jsonStr, jsonMErr := json.Marshal(targetContList)
+		if jsonMErr == nil {
+			arTaegetInfo.Content = string(jsonStr)
+		}
+		arTaegetInfo.Time = time.Now().Unix()
+		addErr := global.GVA_DB_Performanceappraisal.Create(&arTaegetInfo).Error
+		if addErr == nil {
+			response.Result(0, err, "处理成功！2", c)
+		} else {
+			response.Result(107, err, "请添加测评详情！", c)
+		}
+	}
+}

gin_server_admin/api/admin/dutyassess/dutyhandle.go

@@ -579,7 +579,7 @@ func (d *DutyAssessApi) DelSunTarDimeat(c *gin.Context) {
 }
 
 //添加 定性考核指标关系指定
-func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) {
+func (d *DutyAssessApi) AddDutyRelationOld(c *gin.Context) {
 	var requestData AddQualEval
 	err := c.ShouldBindJSON(&requestData)
 	if err != nil {

gin_server_admin/api/admin/dutyassess/planversio.go

@@ -371,7 +371,7 @@ func (d *DutyAssessApi) AddDepartDutyVersio(c *gin.Context) {
 }
 
 //查看考核方案
-func (d *DutyAssessApi) LookDepartDutyVersio(c *gin.Context) {
+func (d *DutyAssessApi) LookDepartDutyVersioOld(c *gin.Context) {
 	var requestData LookDutyVersio
 	err := c.ShouldBindJSON(&requestData)
 	if err != nil {

gin_server_admin/api/index/evaluation/flowsend.go

@@ -87,6 +87,19 @@ func (e *EvaluationInterface) PlusOrMinusPoints(c *gin.Context) {
 	if requestData.Rectification == 0 {
 		requestData.Rectification = 1
 	}
+	var correctionTime int64 = 0
+	if requestData.Rectification == 1 {
+		if requestData.CorrectionTime == "" {
+			response.Result(108, requestData, "请输入整改期限，谢谢！", c)
+			return
+		}
+		var corrTimeErr bool = false
+		correctionTime, corrTimeErr = commonus.DateToTimeStampEs(requestData.CorrectionTime)
+		if corrTimeErr == false {
+			response.Result(108, requestData, "请输入整改期限时间格式不对，谢谢！", c)
+			return
+		}
+	}
 	operationTime := time.Now().Unix()
 	keyNumber := commonus.GetFileNumberEs()
 	var addScore assessmentmodel.ScoreFlow
@@ -137,6 +150,7 @@ func (e *EvaluationInterface) PlusOrMinusPoints(c *gin.Context) {
 	addScore.DutyDepartment = programme.AcceptEvaluation //职责部门
 	addScore.Rectification = requestData.Rectification   //1、需要整改；2：无需整改
 	addScore.Reply = 1
+	addScore.CorrectionTime = correctionTime
 	addErr := global.GVA_DB_Performanceappraisal.Create(&addScore).Error
 	//步进内容
 

gin_server_admin/api/index/evaluation/type.go

@@ -53,14 +53,15 @@ type EnclosureFormat struct {
 
 //加减分数据获取项
 type addPlusOrMinusPoints struct {
-	PlanId        string `json:"planid"`        //方案id
+	PlanId         string `json:"planid"`         //方案id
-	Addtime       string `json:"time"`          //检查时间
+	Addtime        string `json:"time"`           //检查时间
-	Type          int    `json:"type"`          //1：加分；2：减分
+	Type           int    `json:"type"`           //1：加分；2：减分
-	Score         string `json:"score"`         //分数
+	Score          string `json:"score"`          //分数
-	Count         int    `json:"count"`         //次数
+	Count          int    `json:"count"`          //次数
-	State         int    `json:"state"`         //1、定分；2、区间分；3、不定性分值
+	State          int    `json:"state"`          //1、定分；2、区间分；3、不定性分值
-	Reason        string `json:"reason"`        //原因
+	Reason         string `json:"reason"`         //原因
-	Rectification int    `json:"rectification"` //1：整改；2：无需整改
+	Rectification  int    `json:"rectification"`  //1：整改；2：无需整改
+	CorrectionTime string `json:"correctiontime"` //整改期限
 	// Enclosure     []string `json:"enclosure"`     //附件
 	// Enclosure []EnclosureFormat `json:"enclosure"` //附件
 	Enclosure []commonus.EnclosureFormat `json:"enclosure"` //附件

gin_server_admin/api/v1/assessment/target.go

@@ -180,6 +180,7 @@ func (d *DutyHandle) GetTargetList(c *gin.Context) {
 			}
 		}
 		outMapCont.VisibleRangeGroup = tg_val.VisibleRangeGroup
+		outMapCont.ScoringMethod = tg_val.ScoringMethod
 		if tg_val.VisibleRangeGroup != "" {
 			rangeGroupIdAry := strings.Split(tg_val.VisibleRangeGroup, ",")
 			for _, rgeup_val := range rangeGroupIdAry {

gin_server_admin/commonus/publichaneld.go

@@ -3067,7 +3067,7 @@ func JudgeColumn(ascription, columId, title, departMap string) (content assessme
 				global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Where("`q_id` = ?", columId).Updates(&saveSunTarData)
 			}
 			isTrue = true
-			fmt.Printf("1\n")
+			// fmt.Printf("1\n")
 			return
 		}
 	}
@@ -3080,7 +3080,7 @@ func JudgeColumn(ascription, columId, title, departMap string) (content assessme
 			global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Where("`q_parent_id` = ? AND `q_title` = ?", ascription, title).Updates(&saveSunTarData)
 		}
 		isTrue = true
-		fmt.Printf("2\n")
+		// fmt.Printf("2\n")
 		return
 	}
 	ascriptionId, ascriptionErr := strconv.ParseInt(ascription, 10, 64)
@@ -3090,12 +3090,12 @@ func JudgeColumn(ascription, columId, title, departMap string) (content assessme
 	saveColum := assessmentmodel.QualitativeTarget{Title: title, ParentId: ascriptionId, State: 1, AddTime: time.Now().Unix(), Depart: departMap}
 	addErr := global.GVA_DB_Performanceappraisal.Create(&saveColum).Error
 	if addErr != nil {
-		fmt.Printf("3\n")
+		// fmt.Printf("3\n")
 		return
 	}
 	isTrue = true
 	content = saveColum
-	fmt.Printf("4\n")
+	// fmt.Printf("4\n")
 	// panic(content)
 	return
 }

gin_server_admin/model/assessmentmodel/performance_appraisal.go

@@ -31,6 +31,7 @@ type ScoreFlow struct {
 	Rectification        int    `json:"rectification" gorm:"column:sf_rectification;type:tinyint(1) unsigned;default:1;not null;comment:1、需要整改；2：无需整改"`
 	HappenTime           int64  `json:"happentime" gorm:"column:sf_happen_time;type:bigint(20) unsigned;default:0;not null;comment:发生时间"`
 	Count                int    `json:"count" gorm:"column:sf_count;type:int(5) unsigned;default:1;not null;comment:发生次数"`
+	CorrectionTime       int64  `json:"correctiontime" gorm:"column:sf_correctiontime;type:bigint(20) unsigned;default:0;not null;comment:整改期限"`
 }
 
 func (ScoreFlow *ScoreFlow) TableName() string {