From 4db5415f713427ac864005bded6a69ed9b7d3407 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Mon, 30 May 2022 09:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=9F=E8=AE=A1=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/dutyassess/assess.go | 15 +- .../api/admin/dutyassess/assesstype.go | 1 + .../api/index/evaluation/assessment.go | 2 +- .../api/index/evaluation/evaluation.go | 11 +- .../api/index/evaluation/flowsendnew.go | 4 +- gin_server_admin/api/index/evaluation/type.go | 1 + .../api/index/statistics/enter.go | 8 + .../api/index/statistics/tablestatistics.go | 22 +- gin_server_admin/api/reply/quan/enter.go | 10 + gin_server_admin/api/reply/quan/ration.go | 33 +- .../api/statistics/quantification/enter.go | 23 ++ .../statistics/quantification/jisuanshuzhi.go | 30 ++ .../quantification/timestatistics.go | 59 +++- gin_server_admin/commonus/publichaneld.go | 2 +- .../model/assessmentmodel/dutyclass.go | 74 ++++ .../其他支持文件/文档类栏目管理/config.yaml | 328 ++++++++++++++++++ 16 files changed, 591 insertions(+), 32 deletions(-) create mode 100644 gin_server_admin/其他支持文件/文档类栏目管理/config.yaml diff --git a/gin_server_admin/api/admin/dutyassess/assess.go b/gin_server_admin/api/admin/dutyassess/assess.go index 4d39dd7..fcb4696 100644 --- a/gin_server_admin/api/admin/dutyassess/assess.go +++ b/gin_server_admin/api/admin/dutyassess/assess.go @@ -405,7 +405,8 @@ func (e *DutyAssessApi) LookQuantitativeConfig(c *gin.Context) { response.Result(101, err, "数据获取失败！", c) return } - var qualConfigList []assessmentmodel.QuantitativeConfig + // var qualConfigList []assessmentmodel.QuantitativeConfig + var qualConfigList []assessmentmodel.QuantitativeConfigView gormDb := global.GVA_DB_Performanceappraisal if requestData.GroupId != "" { gormDb = gormDb.Where("`group` = ?", requestData.GroupId) @@ -443,6 +444,9 @@ func (e *DutyAssessApi) LookQuantitativeConfig(c *gin.Context) { if requestData.State != 0 { gormDb = gormDb.Where("`state` = ?", requestData.State) } + if requestData.Title != "" { + gormDb = gormDb.Where("`title` LIKE ?", "%"+requestData.Title+"%") + } // gormDb = gormDb.Order("group ASC,departmentid ASC,dimension ASC,target ASC,targetconfig ASC").Order("year DESC").Order("timecopy ASC,id ASC") gormDb = gormDb.Order("`group` ASC").Order("`departmentid` ASC").Order("`dimension` ASC").Order("`target` ASC").Order("`targetconfig` ASC").Order("`year` DESC").Order("`timecopy` ASC").Order("`id` ASC") contErr := gormDb.Find(&qualConfigList).Error @@ -485,10 +489,11 @@ func (e *DutyAssessApi) LookQuantitativeConfig(c *gin.Context) { // if dErr == true { // outCont.DimensionTitle = departmentInfo.Name // } - targetInfo, tErr := commonus.GetTargetInfo(v.Target) - if tErr == true { - outCont.TargetTitle = targetInfo.Title - } + // targetInfo, tErr := commonus.GetTargetInfo(v.Target) + // if tErr == true { + // outCont.TargetTitle = targetInfo.Title + // } + outCont.TargetTitle = v.Title dtargetInfo, dtErr := commonus.GetDetailedTargetInfo(v.TargetConfig) if dtErr == true { outCont.DetailedTargetTitle = dtargetInfo.Title diff --git a/gin_server_admin/api/admin/dutyassess/assesstype.go b/gin_server_admin/api/admin/dutyassess/assesstype.go index 83e380d..41dba4d 100644 --- a/gin_server_admin/api/admin/dutyassess/assesstype.go +++ b/gin_server_admin/api/admin/dutyassess/assesstype.go @@ -104,6 +104,7 @@ type SelectQuantitativeConfig struct { Year int `json:"year"` //年度 Class int `json:"class"` //季度与月度辅助值 State int `json:"state"` //状态（1、启用；2、禁用；3、删除） + Title string `json:"title"` //指标标题 } //输出 diff --git a/gin_server_admin/api/index/evaluation/assessment.go b/gin_server_admin/api/index/evaluation/assessment.go index 415245c..624e102 100644 --- a/gin_server_admin/api/index/evaluation/assessment.go +++ b/gin_server_admin/api/index/evaluation/assessment.go @@ -174,7 +174,7 @@ func (e *EvaluationInterface) NewGetQualDetailedTarget(c *gin.Context) { func AllZreoConfig(cycles int) (monthInt int64) { switch cycles { case 4: - monthInt = commonus.ComputingTime(time.Now().Unix(), 1) + monthInt = commonus.ComputingTime(time.Now().Unix(), 3) // monthInt, _ = strconv.ParseInt(monthstr, 10, 64) case 5: // var dfds error diff --git a/gin_server_admin/api/index/evaluation/evaluation.go b/gin_server_admin/api/index/evaluation/evaluation.go index 61b84e4..7500f78 100644 --- a/gin_server_admin/api/index/evaluation/evaluation.go +++ b/gin_server_admin/api/index/evaluation/evaluation.go @@ -755,7 +755,8 @@ func (e *EvaluationInterface) QualitativeEvalRation(c *gin.Context) { // return // } // response.Result(0, detailsId, "用户端个人要执行的考核任务", c) - var qualEvaList []assessmentmodel.QualitativeEvaluation + // var qualEvaList []assessmentmodel.QualitativeEvaluation + var qualEvaList []assessmentmodel.QualitativeEvaluationView gormDbIng := global.GVA_DB_Performanceappraisal gormDbIng = gormDbIng.Where("`qe_type` = 2 AND `qe_state` = 1 AND FIND_IN_SET(?,`qe_operator`)", userCont.Key) //判断是否已经提交上个月的数据 @@ -771,6 +772,9 @@ func (e *EvaluationInterface) QualitativeEvalRation(c *gin.Context) { if requestData.TargetId != "" { gormDbIng = gormDbIng.Where("qe_target = ?", requestData.TargetId) } + if requestData.Title != "" { + gormDbIng = gormDbIng.Where("et_title LIKE ?", "%"+requestData.Title+"%") + } listErr := gormDbIng.Order("qe_type ASC,qe_group ASC,qe_accept_evaluation ASC,qe_dimension ASC,qe_target ASC,qe_target_sun ASC,qe_detailed_target ASC").Find(&qualEvaList).Error if listErr != nil || len(qualEvaList) < 1 { response.Result(102, qualEvaList, "您没有要参加的考核项目！", c) @@ -861,7 +865,10 @@ func (e *EvaluationInterface) QualitativeEvalRation(c *gin.Context) { quanTitWhere["year"] = commonus.TimeStampToDate(time.Now().Unix(), 11) quanTitWhere["timecopy"] = AllZreoConfig(v.Cycles) quanTitCont := commonus.GetQuantitativeConfig(quanTitWhere) - fmt.Printf("quanTitWhere----------->%v-------->%v\n", quanTitWhere, quanTitCont) + // jsonCont, _ := json.Marshal(quanTitCont) + // qualEvaListjsonCont, _ := json.Marshal(v) + + // fmt.Printf("quanTitWhere----------->%v\n-------->%v\n-------->%v\n", quanTitWhere, string(jsonCont), string(qualEvaListjsonCont)) uotCont.ZeroPrize = strconv.FormatFloat(float64(quanTitCont.Zeroprize)/100, 'f', -1, 64) uotCont.AllPrize = strconv.FormatFloat(float64(quanTitCont.Allprize)/100, 'f', -1, 64) diff --git a/gin_server_admin/api/index/evaluation/flowsendnew.go b/gin_server_admin/api/index/evaluation/flowsendnew.go index 7cbccd4..40f6658 100644 --- a/gin_server_admin/api/index/evaluation/flowsendnew.go +++ b/gin_server_admin/api/index/evaluation/flowsendnew.go @@ -377,7 +377,9 @@ func (e *EvaluationInterface) PlusOrMinusPointsNew(c *gin.Context) { } case 1: //获取分数 - requestData.Score = strconv.FormatInt(programme.MaxScore, 10) + xiaoshufen := strconv.FormatFloat(float64(programme.MaxScore)/100, 'f', -1, 64) + // requestData.Score = strconv.FormatInt(programme.MaxScore, 10) + requestData.Score = xiaoshufen default: if requestData.Score == "" { response.Result(107, requestData, "请您输入要操作的分数，谢谢！", c) diff --git a/gin_server_admin/api/index/evaluation/type.go b/gin_server_admin/api/index/evaluation/type.go index 3ce15a8..76d6916 100644 --- a/gin_server_admin/api/index/evaluation/type.go +++ b/gin_server_admin/api/index/evaluation/type.go @@ -153,6 +153,7 @@ type GetRationFlowLog struct { GroupId string `json:"groupid"` DepartmentID string `json:"departmentid"` TargetId string `json:"targetid"` + Title string `json:"title"` } //定性指标流程展示 diff --git a/gin_server_admin/api/index/statistics/enter.go b/gin_server_admin/api/index/statistics/enter.go index 7c507af..3265908 100644 --- a/gin_server_admin/api/index/statistics/enter.go +++ b/gin_server_admin/api/index/statistics/enter.go @@ -50,6 +50,14 @@ type DutyPlanVersio struct { State int `json:"state"` //状态 } +type PlanVersioMingXi struct { + Group string `json:"group"` //归属集团 + DeaprtId string `json:"deaprtid"` //部门ID + Year string `json:"year"` //年度 + Title string `json:"title"` //编号 + Class int `json:"class"` //状态 +} + //考核方案版本列表查询输出 type DutyPlanVersioOut struct { assessmentmodel.PlanVersio diff --git a/gin_server_admin/api/index/statistics/tablestatistics.go b/gin_server_admin/api/index/statistics/tablestatistics.go index 96c4376..09212be 100644 --- a/gin_server_admin/api/index/statistics/tablestatistics.go +++ b/gin_server_admin/api/index/statistics/tablestatistics.go @@ -22,7 +22,7 @@ func (a *ApiGroup) GetPlanVersionValid(c *gin.Context) { response.Result(1001, isTrue, "您的身份令牌已经失效！请重新登录获取身份令牌！", c) return } - var requestData DutyPlanVersio + var requestData PlanVersioMingXi c.ShouldBindJSON(&requestData) if requestData.Year == "" { requestData.Year = commonus.TimeStampToDate(time.Now().Unix(), 11) @@ -79,7 +79,7 @@ func (a *ApiGroup) GetPlanVersionValid(c *gin.Context) { response.Result(0, readDingXingDataMap, "获取成功", c) } -func (d *dataLockStatistics) planVersiconProcess(pvInfo assessmentmodel.PlanVersio, giveData DutyPlanVersio) { +func (d *dataLockStatistics) planVersiconProcess(pvInfo assessmentmodel.PlanVersio, giveData PlanVersioMingXi) { d.mutext.Lock() defer d.mutext.Unlock() yserInt, _ := strconv.ParseInt(giveData.Year, 10, 64) @@ -120,11 +120,22 @@ func (d *dataLockStatistics) planVersiconProcess(pvInfo assessmentmodel.PlanVers outCont.Unit = pcv.Unit //获取指标内容 var evalTargerCont assessmentmodel.EvaluationTarget - evalErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Select("et_type,et_scoring_method").Where("`et_id` = ?", pcv.Id).First(&evalTargerCont).Error + targetGormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Select("et_type,et_scoring_method,et_title").Where("`et_id` = ?", pcv.Id) + if giveData.Title != "" { + targetGormDb = targetGormDb.Where("et_title LIKE ?", "%"+giveData.Title+"%") + } + if giveData.Class != 0 { + targetGormDb = targetGormDb.Where("et_type = ?", giveData.Class) + } + isAdd := 1 + evalErr := targetGormDb.First(&evalTargerCont).Error scoringMethod := 1 if evalErr == nil { outCont.Type = evalTargerCont.Type scoringMethod = evalTargerCont.ScoringMethod + isAdd = 1 + } else { + isAdd = 2 } //获取执行部门及指标性质 taskId, _, departName, cycle, cycleattr, isDuty, isDutyErr := getDepartTarget(pvInfo.Key, pv.Id, pcv.Id, strconv.FormatInt(pvInfo.Group, 10), strconv.FormatInt(pvInfo.Department, 10)) @@ -590,7 +601,10 @@ func (d *dataLockStatistics) planVersiconProcess(pvInfo assessmentmodel.PlanVers } outCont.ScoreAllList = append(outCont.ScoreAllList, stccStatistics) outCont.StatisticsName = []string{"全奖值", "零奖值", "实际值", "达成率", "得分"} - d.outData = append(d.outData, outCont) + if isAdd == 1 { + d.outData = append(d.outData, outCont) + } + } } } diff --git a/gin_server_admin/api/reply/quan/enter.go b/gin_server_admin/api/reply/quan/enter.go index 8853f9e..af57194 100644 --- a/gin_server_admin/api/reply/quan/enter.go +++ b/gin_server_admin/api/reply/quan/enter.go @@ -36,6 +36,8 @@ type RationLogList struct { ScoringMethod int `json:"scoringmethod"` //计分方式（1：自动；2：手动）"` ScoringScore float64 `json:"scoringscore"` //手动分"` // PlanVersionNumber string `json:"planversionnumber"` //版本号 + Addtime string `json:"time"` //检查时间 + Cycle int `json:"cycle"` //1：班；2：天；3：周；4：月；5：季度；6：年；7：半年 } //审批参数 @@ -49,3 +51,11 @@ type orderIdOrNumber struct { OrderId string `json:"id"` //流程单KEY Number string `json:"number"` //1：同意；2：驳回 } + +type TimeAllDay struct { + Year int64 `json:"year"` //年分"` + Quarter int64 `json:"quarter"` //季度"` + Month int64 `json:"month"` //月"` + Week int64 `json:"week"` //周"` + ToDay int64 `json:"today"` //天"` +} diff --git a/gin_server_admin/api/reply/quan/ration.go b/gin_server_admin/api/reply/quan/ration.go index eb7b449..8e37c63 100644 --- a/gin_server_admin/api/reply/quan/ration.go +++ b/gin_server_admin/api/reply/quan/ration.go @@ -386,13 +386,13 @@ func (a *ApiGroup) SendRationFlow(c *gin.Context) { operationTime := time.Now().Unix() keyNumber := commonus.GetFileNumberEs() var flowLog assessmentmodel.FlowLog - + var allTimeSet TimeAllDay flowLog.Key = keyNumber flowLog.Time = time.Now().Unix() flowLog.EiteTime = time.Now().Unix() flowLog.PlanVersion = requestData.PlanVersionNumber if requestData.Addtime != "" { - timeOccurrence := commonus.DateToTimeStamp(requestData.Addtime) //发生时间 + timeOccurrence := commonus.DateToTimeStamp(fmt.Sprintf("%v-10 12:00:00", requestData.Addtime)) //发生时间 flowLog.Year = commonus.ComputingTime(timeOccurrence, 1) flowLog.Quarter = commonus.ComputingTime(timeOccurrence, 2) flowLog.Month = commonus.ComputingTime(timeOccurrence, 3) @@ -405,6 +405,15 @@ func (a *ApiGroup) SendRationFlow(c *gin.Context) { existenceProess["fl_week"] = commonus.ComputingTime(timeOccurrence, 4) existenceProess["fl_day"] = commonus.ComputingTime(timeOccurrence, 5) + allTimeSet.Year = commonus.ComputingTime(timeOccurrence, 1) + allTimeSet.Quarter = commonus.ComputingTime(timeOccurrence, 2) + allTimeSet.Month = commonus.ComputingTime(timeOccurrence, 3) + allTimeSet.Week = commonus.ComputingTime(timeOccurrence, 4) + allTimeSet.ToDay = commonus.ComputingTime(timeOccurrence, 5) + + // fmt.Printf("lastMonth-->%v-->lastMonthInt, -->%v-->lastMonthErr,-->%v--> operationTime-->%v-->flowLog----->%v\n", lastMonth, lastMonthInt, lastMonthErr, operationTime, flowLog) + // return + } else { lastMonth, _, _ := commonus.GetLastMonth() @@ -412,6 +421,7 @@ func (a *ApiGroup) SendRationFlow(c *gin.Context) { if lastMonthErr == true { operationTime = lastMonthInt } + flowLog.Year = commonus.ComputingTime(operationTime, 1) flowLog.Quarter = commonus.ComputingTime(operationTime, 2) flowLog.Month = commonus.ComputingTime(operationTime, 3) @@ -423,6 +433,13 @@ func (a *ApiGroup) SendRationFlow(c *gin.Context) { existenceProess["fl_month"] = commonus.ComputingTime(operationTime, 3) existenceProess["fl_week"] = commonus.ComputingTime(operationTime, 4) existenceProess["fl_day"] = commonus.ComputingTime(operationTime, 5) + + allTimeSet.Year = commonus.ComputingTime(operationTime, 1) + allTimeSet.Quarter = commonus.ComputingTime(operationTime, 2) + allTimeSet.Month = commonus.ComputingTime(operationTime, 3) + allTimeSet.Week = commonus.ComputingTime(operationTime, 4) + allTimeSet.ToDay = commonus.ComputingTime(operationTime, 5) + } flowLog.EvaluationDepartment = departmentId @@ -502,6 +519,11 @@ func (a *ApiGroup) SendRationFlow(c *gin.Context) { } } + flowDataLog.Year = allTimeSet.Year + flowDataLog.Quarter = allTimeSet.Quarter + flowDataLog.Month = allTimeSet.Month + flowDataLog.Week = allTimeSet.Week + flowDataLog.ToDay = allTimeSet.ToDay flowDataLogAry = append(flowDataLogAry, flowDataLog) } else { yiTianJianMingc = append(yiTianJianMingc, v.TargetName) @@ -547,6 +569,13 @@ func (a *ApiGroup) SendRationFlow(c *gin.Context) { } } + + flowDataLog.Year = allTimeSet.Year + flowDataLog.Quarter = allTimeSet.Quarter + flowDataLog.Month = allTimeSet.Month + flowDataLog.Week = allTimeSet.Week + flowDataLog.ToDay = allTimeSet.ToDay + flowDataLogAry = append(flowDataLogAry, flowDataLog) } diff --git a/gin_server_admin/api/statistics/quantification/enter.go b/gin_server_admin/api/statistics/quantification/enter.go index fd8a0f7..24fc16b 100644 --- a/gin_server_admin/api/statistics/quantification/enter.go +++ b/gin_server_admin/api/statistics/quantification/enter.go @@ -116,3 +116,26 @@ type TongjiFenShu struct { Score float64 `json:"score" gorm:"column:sf_score;type:bigint(20) unsigned;default:0;not null;comment:分值(乘100录入)"` Count float64 `json:"count" gorm:"column:sf_count;type:int(5) unsigned;default:1;not null;comment:发生次数"` } + +type AddDutyNewCont struct { + Id string `json:"id"` //维度ID + Name string `json:"name"` + // Order int64 `json:"ordering"` + ZhiFraction int `json:"zhiFraction"` + Child []EvaluPross `json:"child"` //考核细则 +} + +//指标 +type EvaluPross struct { + Id string `json:"id"` //维度ID + Name string `json:"name"` + Content string `json:"content"` //指标说明 + Unit string `json:"unit"` //单位"` + ReferenceScore float64 `json:"referencescore"` //标准分值"` + Cycles int `json:"cycle"` //1：班；2：天；3：周；4：月；5：季度；6：年"` + CycleAttres int `json:"cycleattr"` //辅助计数"` + State int `json:"state"` + Score int64 `json:"score"` //分数 + QualEvalId string `json:"qeid"` + Status int `json:"status"` +} diff --git a/gin_server_admin/api/statistics/quantification/jisuanshuzhi.go b/gin_server_admin/api/statistics/quantification/jisuanshuzhi.go index e09c263..cd99d4e 100644 --- a/gin_server_admin/api/statistics/quantification/jisuanshuzhi.go +++ b/gin_server_admin/api/statistics/quantification/jisuanshuzhi.go @@ -1,6 +1,7 @@ package quantification import ( + "encoding/json" "strconv" "github.com/flipped-aurora/gin-vue-admin/server/commonus" @@ -303,3 +304,32 @@ func (d *dataLockStatistics) StatisticalQueryCriteriaXin(qualId int64) { } synergeticProcess.Done() } + +//获取指标参考值 +/* +@dimensionId 维度 +@targetId 指标 +@departmentId 部门 +*/ +func GetTargetReferenceValue(dimensionId, targetId, departmentId string) (standardValue float64) { + var planVersion assessmentmodel.PlanVersio + err := global.GVA_DB_Performanceappraisal.Where("state = 1 AND department = ?").First(&planVersion).Error + if err != nil { + return + } + var planVersioInfo []AddDutyNewCont + jsonErr := json.Unmarshal([]byte(planVersion.Content), &planVersioInfo) + if jsonErr != nil { + return + } + for _, v := range planVersioInfo { + if v.Id == dimensionId { + for _, cv := range v.Child { + if cv.Id == targetId { + standardValue = cv.ReferenceScore + } + } + } + } + return +} diff --git a/gin_server_admin/api/statistics/quantification/timestatistics.go b/gin_server_admin/api/statistics/quantification/timestatistics.go index ae497e3..961451a 100644 --- a/gin_server_admin/api/statistics/quantification/timestatistics.go +++ b/gin_server_admin/api/statistics/quantification/timestatistics.go @@ -50,6 +50,9 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData statisticalMethod = 2 } } + // jsonCont, _ := json.Marshal(dataAry) + // fmt.Printf("wherStr------>%v\n", string(jsonCont)) + // return //根据时间维度进行统计 for _, tfv := range timeFrame { if commonus.IsItTrueString(tfv.XLine, outputData.XLine) == false { @@ -112,6 +115,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData var wherStr string if norm == 1 { + var canKaoZhi float64 = 0 //定性考核 if len(orgv.SunOrg) > 0 { @@ -119,8 +123,15 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData wherStr = fmt.Sprintf("sf_evaluation_plan IN %v AND `sf_year` = %v AND `sf_month` IN %v AND sf_duty_department IN %v", taskIdStrWher, yearVal, monthStr, orgvSunOrg) } else { wherStr = fmt.Sprintf("sf_evaluation_plan IN %v AND `sf_year` = %v AND `sf_month` IN %v AND sf_duty_department = %v", taskIdStrWher, yearVal, monthStr, orgv.Id) + + canKaoZhi = GetTargetReferenceValue(strconv.FormatInt(taskCont.Dimension, 10), taskId, orgv.Id) } sumScore, averageScore = AverageOfSumNature(wherStr, 1) + if canKaoZhi != 0 { + if sumScore > canKaoZhi { + sumScore = canKaoZhi + } + } } else { //定量考核 @@ -137,7 +148,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData switch statisticalMethod { case 1: //合计 - normNameTotal := fmt.Sprintf("%v%v %v总值", yearVal, orgv.Name, normName) + normNameTotal := fmt.Sprintf("%v%v %v", yearVal, orgv.Name, normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -170,7 +181,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData } default: //合计与平均 - normNameTotal := fmt.Sprintf("%v%v %v总值", yearVal, orgv.Name, normName) + normNameTotal := fmt.Sprintf("%v%v %v", yearVal, orgv.Name, normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -236,7 +247,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData switch statisticalMethod { case 1: //合计 - normNameTotal := fmt.Sprintf("%v总值", normName) + normNameTotal := fmt.Sprintf("%v", normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -269,7 +280,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData } default: //合计与平均 - normNameTotal := fmt.Sprintf("%v总值", normName) + normNameTotal := fmt.Sprintf("%v", normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -340,21 +351,27 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData taskIdStrWher = fmt.Sprintf("%v)", taskIdStrWher) if len(taskIdAry) > 0 { var wherStr string + var canKaoZhi float64 = 0 if norm == 1 { //定性考核 if len(orgv.SunOrg) > 0 { wherStr = fmt.Sprintf("sf_evaluation_plan IN %v AND `sf_year` = %v AND `sf_quarter` = %v AND sf_duty_department IN %v", taskIdStrWher, yearVal, tfv.YearName, orgvSunOrg) } else { wherStr = fmt.Sprintf("sf_evaluation_plan IN %v AND `sf_year` = %v AND `sf_quarter` = %v AND sf_duty_department = %v", taskIdStrWher, yearVal, tfv.YearName, orgv.Id) + canKaoZhi = GetTargetReferenceValue(strconv.FormatInt(taskCont.Dimension, 10), taskId, orgv.Id) } sumScore, averageScore = AverageOfSumNature(wherStr, 1) + if canKaoZhi != 0 && sumScore > canKaoZhi { + sumScore = canKaoZhi + } } else { //定量考核 if len(orgv.SunOrg) > 0 { wherStr = fmt.Sprintf("fld_evaluation_id IN %v AND `fl_year` = %v AND `fl_quarter` = %v AND fl_duty_department IN %v", taskIdStrWher, yearVal, tfv.YearName, orgvSunOrg) } else { wherStr = fmt.Sprintf("fld_evaluation_id IN %v AND `fl_year` = %v AND `fl_quarter` = %v AND fl_duty_department = %v", taskIdStrWher, yearVal, tfv.YearName, orgv.Id) + } sumScore, averageScore = AverageOfSum(wherStr, 1) @@ -363,7 +380,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData switch statisticalMethod { case 1: //合计 - normNameTotal := fmt.Sprintf("%v%v %v总值", yearVal, orgv.Name, normName) + normNameTotal := fmt.Sprintf("%v%v %v", yearVal, orgv.Name, normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -396,7 +413,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData } default: //合计与平均 - normNameTotal := fmt.Sprintf("%v%v %v总值", yearVal, orgv.Name, normName) + normNameTotal := fmt.Sprintf("%v%v %v", yearVal, orgv.Name, normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -459,7 +476,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData switch statisticalMethod { case 1: //合计 - normNameTotal := fmt.Sprintf("%v总值", normName) + normNameTotal := fmt.Sprintf("%v", normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -492,7 +509,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData } default: //合计与平均 - normNameTotal := fmt.Sprintf("%v总值", normName) + normNameTotal := fmt.Sprintf("%v", normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -565,13 +582,18 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData var wherStr string if norm == 1 { //定性考核 + var canKaoZhi float64 = 0 if len(orgv.SunOrg) > 0 { wherStr = fmt.Sprintf("sf_evaluation_plan IN %v AND `sf_year` = %v AND `sf_month` = %v AND sf_duty_department IN %v", taskIdStrWher, yearVal, tfv.YearName, orgvSunOrg) } else { wherStr = fmt.Sprintf("sf_evaluation_plan IN %v AND `sf_year` = %v AND `sf_month` = %v AND sf_duty_department = %v", taskIdStrWher, yearVal, tfv.YearName, orgv.Id) + canKaoZhi = GetTargetReferenceValue(strconv.FormatInt(taskCont.Dimension, 10), taskId, orgv.Id) } sumScore, averageScore = AverageOfSumNature(wherStr, 1) + if canKaoZhi != 0 && sumScore > canKaoZhi { + sumScore = canKaoZhi + } } else { //定量考核 if len(orgv.SunOrg) > 0 { @@ -586,7 +608,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData switch statisticalMethod { case 1: //合计 - normNameTotal := fmt.Sprintf("%v%v %v总值", yearVal, orgv.Name, normName) + normNameTotal := fmt.Sprintf("%v%v %v", yearVal, orgv.Name, normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -619,7 +641,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData } default: //合计与平均 - normNameTotal := fmt.Sprintf("%v%v %v总值", yearVal, orgv.Name, normName) + normNameTotal := fmt.Sprintf("%v%v %v", yearVal, orgv.Name, normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -681,7 +703,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData switch statisticalMethod { case 1: //合计 - normNameTotal := fmt.Sprintf("%v总值", normName) + normNameTotal := fmt.Sprintf("%v", normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -714,7 +736,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData } default: //合计与平均 - normNameTotal := fmt.Sprintf("%v总值", normName) + normNameTotal := fmt.Sprintf("%v", normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -786,13 +808,18 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData var wherStr string if norm == 1 { //定性考核 + var canKaoZhi float64 = 0 if len(orgv.SunOrg) > 0 { wherStr = fmt.Sprintf("sf_evaluation_plan IN %v AND `sf_year` = %v AND sf_duty_department IN %v", taskIdStrWher, tfv.YearName, orgvSunOrg) } else { wherStr = fmt.Sprintf("sf_evaluation_plan IN %v AND `sf_year` = %v AND sf_duty_department = %v", taskIdStrWher, tfv.YearName, orgv.Id) + canKaoZhi = GetTargetReferenceValue(strconv.FormatInt(taskCont.Dimension, 10), taskId, orgv.Id) } sumScore, averageScore = AverageOfSumNature(wherStr, 1) + if canKaoZhi != 0 && sumScore > canKaoZhi { + sumScore = canKaoZhi + } } else { //定量考核 if len(orgv.SunOrg) > 0 { @@ -808,7 +835,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData switch statisticalMethod { case 1: //合计 - normNameTotal := fmt.Sprintf("%v %v总值", orgv.Name, normName) + normNameTotal := fmt.Sprintf("%v %v", orgv.Name, normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -841,7 +868,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData } default: //合计与平均 - normNameTotal := fmt.Sprintf("%v %v总值", orgv.Name, normName) + normNameTotal := fmt.Sprintf("%v %v", orgv.Name, normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -907,7 +934,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData switch statisticalMethod { case 1: //合计 - normNameTotal := fmt.Sprintf("%v总值", normName) + normNameTotal := fmt.Sprintf("%v", normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series @@ -940,7 +967,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData } default: //合计与平均 - normNameTotal := fmt.Sprintf("%v总值", normName) + normNameTotal := fmt.Sprintf("%v", normName) if commonus.IsItTrueString(normNameTotal, outputData.Cylindrical) == false { outputData.Cylindrical = append(outputData.Cylindrical, normNameTotal) var seriesInfo series diff --git a/gin_server_admin/commonus/publichaneld.go b/gin_server_admin/commonus/publichaneld.go index 6a4345c..369fe41 100644 --- a/gin_server_admin/commonus/publichaneld.go +++ b/gin_server_admin/commonus/publichaneld.go @@ -4017,7 +4017,7 @@ func CalculateScore(targetScore int64, resultval, allPrizes, zeroPrizes, Capping //递归查找指定部门所有子类 func DiGuiOrgSun(superior int64, idary []int64) (groupId []int64) { - fmt.Printf("DiGui----->%v\n", superior) + // fmt.Printf("DiGui----->%v\n", superior) // return // groupId = 0 var govMap []OutGovCont diff --git a/gin_server_admin/model/assessmentmodel/dutyclass.go b/gin_server_admin/model/assessmentmodel/dutyclass.go index bad867f..dbbde80 100644 --- a/gin_server_admin/model/assessmentmodel/dutyclass.go +++ b/gin_server_admin/model/assessmentmodel/dutyclass.go @@ -315,6 +315,7 @@ type QualitativeEvaluation struct { func (QualitativeEvaluation *QualitativeEvaluation) TableName() string { return "qualitative_evaluation" } + func (q *QualitativeEvaluation) GetCont(whereMap interface{}, field ...string) (err error) { gormDb := global.GVA_DB_Performanceappraisal.Model(&q) if len(field) > 0 { @@ -326,6 +327,51 @@ func (q *QualitativeEvaluation) GetCont(whereMap interface{}, field ...string) ( return } +type QualitativeEvaluationView struct { + Id int64 `json:"id" gorm:"primaryKey;column:qe_id;type:bigint(20) unsigned;not null;comment:Id;index"` + Title string `json:"title" gorm:"column:qe_title;type:text;comment:考核名称"` + DepartmentId string `json:"parentid" gorm:"column:qe_department_id;type:text;comment:执行考核部门ID"` + Dimension int64 `json:"dimension" gorm:"column:qe_dimension;type:bigint(20) unsigned;default:0;not null;comment:考核维度"` + Target int64 `json:"target" gorm:"column:qe_target;type:bigint(20) unsigned;default:0;not null;comment:考核指标"` + TargetSun int64 `json:"targetsun" gorm:"column:qe_target_sun;type:bigint(20) unsigned;default:0;not null;comment:考核指标子栏目"` + DetailedTarget int64 `json:"detailedtarget" gorm:"column:qe_detailed_target;type:bigint(20) unsigned;default:0;not null;comment:考核细则"` + Type int `json:"type" gorm:"column:qe_type;type:int(1) unsigned;default:1;not null;comment:1：定性考核；2：定量考核"` + Weight int64 `json:"weight" gorm:"column:qe_weight;type:int(5) unsigned;default:0;not null;comment:权重"` + Unit string `json:"unit" gorm:"column:qe_unit;type:varchar(255);comment:单位"` + ReferenceScore int64 `json:"referencescore" gorm:"column:qe_reference_score;type:int(9) unsigned;default:0;not null;comment:标准分值"` + State int `json:"state" gorm:"column:qe_state;type:int(1) unsigned;default:1;not null;comment:状态（1：启用；2：禁用；3：删除）"` + Addtime int64 `json:"addtime" gorm:"column:qe_addtime;type:bigint(20) unsigned;default:0;not null;comment:添加时间"` + Eitetime int64 `json:"eitetime" gorm:"column:qe_eitetime;type:bigint(20) unsigned;default:0;not null;comment:编辑时间"` + Group int64 `json:"group" gorm:"column:qe_group;type:bigint(20) unsigned;default:0;not null;comment:归属集团"` + QualEvalId string `json:"qualevalid" gorm:"column:qe_qual_eval_id;type:varchar(200) unsigned;default:0;not null;comment:性质考核方案"` + Cycles int `json:"cycle" gorm:"column:qe_cycle;type:tinyint(1) unsigned;default:1;not null;comment:1：班；2：天；3：周；4：月；5：季度；6：年"` + CycleAttres int `json:"cycleattr" gorm:"column:qe_cycleattr;type:int(9) unsigned;default:1;not null;comment:辅助计数"` + AcceptEvaluation int64 `json:"acceptevaluation" gorm:"column:qe_accept_evaluation;type:bigint(20) unsigned;default:0;not null;comment:接受考核部门"` + Operator string `json:"operator" gorm:"column:qe_operator;type:text;comment:执行人"` + Content string `json:"content" gorm:"column:qe_content;type:text;comment:补充说明"` + MinScore int64 `json:"minscore" gorm:"column:qe_min_score;type:bigint(20) unsigned;default:0;not null;comment:最小分*100保存"` + MaxScore int64 `json:"maxscore" gorm:"column:qe_max_score;type:bigint(20) unsigned;default:0;not null;comment:最大分*100保存"` + CensorType string `json:"censortype" gorm:"column:qe_censor_type;type:tinyint(1) unsigned;default:1;not null;comment:检查方式"` + CensorCont string `json:"censorcont" gorm:"column:qe_censor_cont;type:longtext;comment:检查依据"` + CensorRate int `json:"censorrate" gorm:"column:qe_censor_rate;type:int(5) unsigned;default:1;not null;comment:检查频次"` + EtTitle string `json:"ettitle" gorm:"column:et_title;type:varchar(255);comment:指标名称"` +} + +func (QualitativeEvaluationView *QualitativeEvaluationView) TableName() string { + return "qualitative_evaluation_view" +} + +func (q *QualitativeEvaluationView) GetCont(whereMap interface{}, field ...string) (err error) { + gormDb := global.GVA_DB_Performanceappraisal.Model(&q) + if len(field) > 0 { + fieldStr := strings.Join(field, ",") + gormDb = gormDb.Select(fieldStr) + } + gormDb = gormDb.Where(whereMap) + err = gormDb.First(&q).Error + return +} + //性质考核方案 type DepartmentDimension struct { Id int64 `json:"id" gorm:"primaryKey;column:dd_id;type:bigint(20) unsigned;not null;comment:Id;index"` @@ -398,6 +444,11 @@ type FlowLogData struct { ScoringMethod int `json:"scoringmethod" gorm:"column:fld_scoring_method;type:int(1) unsigned;default:1;not null;comment:计分方式（1：自动；2：手动）"` ScoringScore float64 `json:"scoringscore" gorm:"column:fld_scoring_score;type:bigint(20) unsigned;default:0;not null;comment:手动分"` PlanVersion string `json:"planversion" gorm:"column:fld_planversion;type:varchar(255);comment:版本号"` + Year int64 `json:"year" gorm:"column:fld_year;type:int(7) unsigned;default:0;not null;comment:年分"` + Quarter int64 `json:"quarter" gorm:"column:fld_quarter;type:int(2) unsigned;default:0;not null;comment:季度"` + Month int64 `json:"month" gorm:"column:fld_month;type:int(2) unsigned;default:0;not null;comment:月"` + Week int64 `json:"week" gorm:"column:fld_week;type:int(5) unsigned;default:0;not null;comment:周"` + ToDay int64 `json:"today" gorm:"column:fld_day;type:int(5) unsigned;default:0;not null;comment:天"` } func (FlowLogData *FlowLogData) TableName() string { @@ -427,6 +478,29 @@ func (QuantitativeConfig *QuantitativeConfig) TableName() string { return "quantitative_config" } +type QuantitativeConfigView struct { + Id int64 `json:"id" gorm:"primaryKey;column:id;type:bigint(20) unsigned;not null;comment:Id;index"` + DepartmentId int64 `json:"departmentid" gorm:"column:departmentid;type:bigint(20) unsigned;default:0;not null;comment:部门ID"` + Group int64 `json:"group" gorm:"column:group;type:bigint(20) unsigned;default:0;not null;comment:集团ID"` + Dimension int64 `json:"dimension" gorm:"column:dimension;type:bigint(20) unsigned;default:0;not null;comment:维度"` + Target int64 `json:"target" gorm:"column:target;type:bigint(20) unsigned;default:0;not null;comment:指标"` + TargetConfig int64 `json:"targetconfig" gorm:"column:targetconfig;type:bigint(20) unsigned;default:0;not null;comment:指标细则"` + Type int64 `json:"type" gorm:"column:type;type:tinyint(1) unsigned;default:0;not null;comment:1、年度；2、季度；3、月度"` + Year int64 `json:"year" gorm:"column:year;type:bigint(20) unsigned;default:0;not null;comment:年度"` + Timecopy int64 `json:"timecopy" gorm:"column:timecopy;type:int(3) unsigned;default:0;not null;comment:季度与月度辅助值"` + Zeroprize float64 `json:"zeroprize" gorm:"column:zeroprize;type:int(7) unsigned;default:0;not null;comment:零奖值"` + Allprize float64 `json:"allprize" gorm:"column:allprize;type:int(7) unsigned;default:0;not null;comment:全奖值"` + Time int64 `json:"time" gorm:"column:time;type:bigint(20) unsigned;default:0;not null;comment:创建时间"` + State int `json:"state" gorm:"column:state;type:int(1) unsigned;default:1;not null;comment:状态（1：启用；2：禁用；3：删除）"` + Capping int `json:"capping" gorm:"column:capping;type:int(1) unsigned;default:2;not null;comment:是否封顶（1、是；2：否）"` + CappingVal float64 `json:"cappingval" gorm:"column:capping_val;type:bigint(20) unsigned;default:0;not null;comment:封顶值"` + Title string `json:"title" gorm:"column:title;type:varchar(255);comment:指标名称"` +} + +func (QuantitativeConfigView *QuantitativeConfigView) TableName() string { + return "quantitative_config_view" +} + //定性考核指标关系指定 type Assesstarget struct { Id int64 `json:"id" gorm:"primaryKey;column:at_id;type:bigint(20) unsigned;not null;comment:Id;index"` diff --git a/gin_server_admin/其他支持文件/文档类栏目管理/config.yaml b/gin_server_admin/其他支持文件/文档类栏目管理/config.yaml new file mode 100644 index 0000000..634d5c3 --- /dev/null +++ b/gin_server_admin/其他支持文件/文档类栏目管理/config.yaml @@ -0,0 +1,328 @@ +aliyun-oss: + endpoint: yourEndpoint + access-key-id: yourAccessKeyId + access-key-secret: yourAccessKeySecret + bucket-name: yourBucketName + bucket-url: yourBucketUrl + base-path: yourBasePath +autocode: + transfer-restart: true + root: l:\任官钰\代码\gin-vue-admin-master\gin-vue-admin-master + server: /server + server-api: /api/v1/autocode + server-initialize: /initialize + server-model: /model/autocode + server-request: /model/autocode/request/ + server-router: /router/autocode + server-service: /service/autocode + web: /web/src + web-api: /api + web-form: /view + web-table: /view +captcha: + key-long: 6 + img-width: 240 + img-height: 80 +casbin: + model-path: ./resource/rbac_model.conf +email: + to: xxx@qq.com + port: 465 + from: xxx@163.com + host: smtp.163.com + is-ssl: true + secret: xxx + nickname: test +excel: + dir: ./resource/excel/ +jwt: + buffer-time: 86400 + expires-time: 604800 + issuer: qmPlus + signing-key: a77a9442-4c2b-466b-a650-9495e04d285c +local: + path: uploads/file +mysql: + path: 127.0.0.1:3306 + config: charset=utf8mb4&parseTime=True&loc=Local + db-name: gva + username: gva + password: "YNsk3zbP4sTASmzJ" + max-idle-conns: 0 + max-open-conns: 0 + log-mode: "" + log-zap: false +qiniu: + zone: ZoneHuaDong + bucket: "" + img-path: "" + use-https: false + access-key: "" + secret-key: "" + use-cdn-domains: false +redis: + db: 0 + addr: 127.0.0.1:6379 + password: "" +rediswechat: + db: 1 + addr: 127.0.0.1:6379 + password: "" +rediswechat2: + db: 2 + addr: 127.0.0.1:6379 + password: "" +rediswechat5: + db: 5 + addr: 127.0.0.1:6379 + password: "" +redisprefix: + prefix: "HXGK_GO_ZhixingCollege" + alias: "dev" + +system: + env: public + addr: 8888 + db-type: mysql + oss-type: local + use-multipoint: true + iplimit-count: 15000 + iplimit-time: 3600 +tencent-cos: + bucket: xxxxx-10005608 + region: ap-shanghai + secret-id: xxxxxxxx + secret-key: xxxxxxxx + base-url: https://gin.vue.admin + path-prefix: github.com/flipped-aurora/gin-vue-admin/server +timer: + start: true + spec: '@daily' + detail: + - tableName: sys_operation_records + compareField: created_at + interval: 2160h + - tableName: jwt_blacklists + compareField: created_at + interval: 168h +zap: + level: info + format: console + prefix: '[github.com/flipped-aurora/gin-vue-admin/server]' + director: log + showLine: true + encode-level: LowercaseColorLevelEncoder + stacktrace-key: stacktrace + log-in-console: true + + +# mysql connect configuration +# 其他数据库配置 +#app主数据库 +mysqlMaster: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'hengxingaoke_tes' + username: 'hengxingaoke_tes' + password: 'JsTt6iTpkZ85wDnF' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#文档属性数据库 +mysqlBookDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'learnmessage' + username: 'learnmessage' + password: 'JyppSdcLT27f7dpB' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#微信员工信息表 +mysqlWatchDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'wechatuser' + username: 'wechatuser' + password: '8jrFG2AzpJPxs88m' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#错题库 +mysqlErrorSubjectDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'errorsubject' + username: 'errorsubject' + password: 'abRcXzraCMFYC4Me' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#自我测验 +mysqlMyTestDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'selftestdatabase' + username: 'selftestdatabase' + password: 'mXDWEBJCd5acnCjD' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#图文信息数据库 +mysqlBooImgkDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'readdocument' + username: 'readdocument' + password: 'CY2yanCmAP8p8bxj' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#计分明细数据库 +mysqlIntegralDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'leaguetabledata' + username: 'leaguetabledata' + password: 'PxeX8Dnw88G4Jpnr' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#趣味问答 +mysqlQADate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'ques_and_answers' + username: 'ques_and_answers' + password: 'CT7XGBrAwdnXkTNX' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#风云榜统计数据库 +mysqlBillboardDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'statisticsing' + username: 'statisticsing' + password: '4iMZNtMT8fk8imEb' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#健康上报数据库 +mysqlHealthReportDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'location' + username: 'location' + password: 'XreBJrkYh7K3jfbm' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + + #审批流程数据库 +mysqlApprovalProcess: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'workflow' + username: 'workflow' + password: 'kSwXD3LBsnJ8dsz4' + max-idle-conns: 100 + max-open-conns: 1500 + log-mode: false + log-zap: "" + + #绩效考核数据库 +mysqlPerformanceappraisal: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'perform' + username: 'perform' + password: 'amtzSrN5WnMsS4hb' + max-idle-conns: 100 + max-open-conns: 1500 + log-mode: false + log-zap: "" + #企业微信回调记录 +mysqlWechatCallBack: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'wechatlog' + username: 'wechatlog' + password: 'j7Hs8Tb6SkZzy2ee' + max-idle-conns: 100 + max-open-conns: 1500 + log-mode: false + log-zap: "" +#HR系统 +hrdatabase: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'human_resources' + username: 'human_resources' + password: 'hn4FaeBtePdnw2K6' + max-idle-conns: 100 + max-open-conns: 1500 + log-mode: false + log-zap: "" + + + +#企业微信相关设置 +workwechatid: + companyid: 'ww02f310301953277a' #企业ID + + +workwechatschool: #知行学院 + agentid: 1000008 + secretstr: 'YJOHrmHtvevAdctg-06TMLnPokIaLHdfrQMyQolZQC8' + #知行学院API接收消息 + wechattokening: 'kkUA3s2s3' #Token + encodingaeskey: 'ZI29of85mTgQPik8LLjDnYKlAECDbI23Pq886VJ9Azf' #EncodingAESKey + +workwechatappmaillist: #通讯录 + secretstr: 'yjcQXkh6_116QKjfZfbRSyzdrFFZ9jbVlKJtL2tn3OU' + +healthreport: #健康上报 + secretstr: 'smjpGmFo5wp18BZGiLaECFr84Blv429v_GFdKp4_0YQ' + +#测试企业 +workwechatids: + companyid: 'ww708746402de33ba7' #企业ID + + +workwechatschools: #测试 + agentid: 1000021 + secretstr: 'rbqos2un6vVY5k_c2aOFK6HUuONeJsiBqwRZXTDVBKU' + #知行学院API接收消息 + wechattokening: 'kkUA3s2s3' #Token + encodingaeskey: 'ZI29of85mTgQPik8LLjDnYKlAECDbI23Pq886VJ9Azf' #EncodingAESKey + +workwechatappmaillists: #通讯录 + secretstr: 'TSSsJXiqh3RKl0NYIoB-sPc43MUIRJ1ppALWtzyLY94' + +healthreports: #健康上报 + secretstr: 'smjpGmFo5wp18BZGiLaECFr84Blv429v_GFdKp4_0YQ' + +privateConfig: #私人配置 + #visit: 'http://docu.hxgk.net/uploadfileing/uploadimging' + visit: 'http://docs.hxgk.group/uploadfileing/uploadimging' + appKey: 'heng_xin_gao_ke_AppKey' \ No newline at end of file