变更

api/admin/dutyassess/assess.go

@@ -748,9 +748,9 @@ func (d *DutyAssessApi) LookDepartDutyVersio(c *gin.Context) {
 		var planVersioInfo []AddDutyNewCont
 		jsonErr := json.Unmarshal([]byte(assessTargetContent.Content), &planVersioInfo)
 		if jsonErr == nil {
-			for _, pv := range planVersioInfo {
-				for _, pvChild := range pv.Child {
-					if pvChild.Status == 1 || pvChild.Status == 3 {
+			for _, pv := range planVersioInfo { //维度
+				for _, pvChild := range pv.Child { //指标
+					if pvChild.Status == 1 || pvChild.Status == 3 { //判断是不是禁止指标
 						var uotCont TargetContOutCont
 						//集团
 						uotCont.Group = strconv.FormatInt(assessTargetContent.Group, 10)

api/admin/dutyassess/planversio.go

@@ -774,7 +774,7 @@ func (d *DutyAssessApi) EiteDepartExplain(c *gin.Context) {
 	eiteData["qe_eitetime"] = time.Now().Unix()
 	eiteData["qe_content"] = requestData.Content
 	if requestData.State > 0 {
-		eiteData["qe_state"] = requestData.State
+		// eiteData["qe_state"] = requestData.State
 		eiteData["observer"] = requestData.State
 	} else {
 		eiteData["qe_state"] = 2

api/statistics/quantification/summary_details.go

@@ -529,7 +529,7 @@ func (a *ApiGroup) SummaryDetailsXingLog(c *gin.Context) {
 		requestData.Months = 12
 	}
 	var scoreFlowList []assessmentmodel.ScoreFlow
-	minusErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.ScoreFlow{}).Select("sf_plus_reduce_score,sf_score,sf_evaluation_department,sf_count,sf_evaluation_user,sf_happen_time,sf_time").Where("sf_reply IN ? AND sf_duty_department = ? AND sf_year = ? AND sf_month = ? AND sf_target_id = ?", []int{2, 3}, requestData.Department, requestData.Year, requestData.Months, requestData.TargetId).Find(&scoreFlowList).Error
+	minusErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.ScoreFlow{}).Select("sf_plus_reduce_score,sf_score,sf_evaluation_department,sf_count,sf_evaluation_user,sf_happen_time,sf_time,sf_reason").Where("sf_reply IN ? AND sf_duty_department = ? AND sf_year = ? AND sf_month = ? AND sf_target_id = ?", []int{2, 3}, requestData.Department, requestData.Year, requestData.Months, requestData.TargetId).Find(&scoreFlowList).Error
 	if minusErr != nil {
 		response.Result(105, minusErr, "没有数据", c)
 		return
@@ -556,7 +556,7 @@ func (a *ApiGroup) SummaryDetailsXingLog(c *gin.Context) {
 		flowScoreCont.EvalUserCont = append(flowScoreCont.EvalUserCont, evalUser)
 		flowScoreList = append(flowScoreList, flowScoreCont)
 	}
-	response.Result(0, flowScoreList, "没有数据", c)
+	response.Result(0, flowScoreList, "查询成功", c)
 }
 
 // 定性月份分值合计

api/v1/positionkpi/postscheme.go

@@ -0,0 +1,8 @@
+package positionkpi
+
+import "github.com/gin-gonic/gin"
+
+//获取岗位相关指标
+func (a *ApiMethod) GetPostAboutTargetList(c *gin.Context) {
+
+}

api/v1/shiyan/shiyan.go

@@ -2967,10 +2967,17 @@ func (s *ShiyanApi) DelFlowDataUser(c *gin.Context) {
 		if len(flowKey) > 0 {
 			global.GVA_DB_Performanceappraisal.Where("fld_flow_log IN ?", flowKey).Delete(&assessmentmodel.FlowLogData{})
 			global.GVA_DB_Performanceappraisal.Where("fl_key IN ?", flowKey).Delete(&assessmentmodel.FlowLog{})
+			global.GVA_DB_Performanceappraisal.Where("ep_order_key IN ?", flowKey).Delete(&assessmentmodel.EvaluationProcess{})
 		}
 	}
 	//定性审核
+	var dingxinOrderid []int64
+	dxErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.ScoreFlow{}).Select("sf_key").Where("sf_evaluation_user = ?", requestData.Id).Find(&dingxinOrderid)
+	if dxErr == nil && len(dingxinOrderid) > 0 {
 		global.GVA_DB_Performanceappraisal.Where("sf_evaluation_user = ?", requestData.Id).Delete(&assessmentmodel.ScoreFlow{})
+		global.GVA_DB_Performanceappraisal.Where("ep_order_key IN ?", dingxinOrderid).Delete(&assessmentmodel.EvaluationProcess{})
+	}
+
 	response.Result(0, requestData, "处理完毕", c)
 
 	//判断定量考核有无后续数据
@@ -2982,6 +2989,7 @@ func (s *ShiyanApi) DelFlowDataUser(c *gin.Context) {
 			delErr := global.GVA_DB_Performanceappraisal.Where("fld_flow_log = ?", v).First(&flowData).Error
 			if delErr != nil {
 				global.GVA_DB_Performanceappraisal.Where("fl_key = ?", v).Delete(&assessmentmodel.FlowLog{})
+				global.GVA_DB_Performanceappraisal.Where("ep_order_key = ?", v).Delete(&assessmentmodel.EvaluationProcess{})
 			}
 		}
 	}