From cd69d99240f60030dda50992d1bcd972f8c15daa Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Fri, 19 Aug 2022 13:33:28 +0800 Subject: [PATCH] 123 --- api/admin/dutyassess/dutyhandle.go | 56 ++++++++++++++-------------- api/index/statistics/queryresults.go | 4 +- api/v1/assessment/target.go | 18 ++++----- config.yaml | 4 +- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/api/admin/dutyassess/dutyhandle.go b/api/admin/dutyassess/dutyhandle.go index ac7b3b8..cfb26cd 100644 --- a/api/admin/dutyassess/dutyhandle.go +++ b/api/admin/dutyassess/dutyhandle.go @@ -14,7 +14,7 @@ import ( "github.com/gin-gonic/gin" ) -//获取定性考核指标列表(下拉列表) +// 获取定性考核指标列表(下拉列表) func (d *DutyAssessApi) SelectDutyList(c *gin.Context) { var evalTargetList []assessmentmodel.EvaluationTarget err := global.GVA_DB_Performanceappraisal.Where("`et_type` = 1 AND `et_state` = 1").Find(&evalTargetList).Error @@ -47,7 +47,7 @@ func (d *DutyAssessApi) SelectDutyList(c *gin.Context) { response.Result(0, listAry, "查询完成！", c) } -//定性考核列表（部门方案用的） +// 定性考核列表（部门方案用的） func (d *DutyAssessApi) DutyDepartmentList(c *gin.Context) { var requestData getDepartAssObtains err := c.ShouldBindJSON(&requestData) @@ -105,7 +105,7 @@ func (d *DutyAssessApi) DutyDepartmentList(c *gin.Context) { response.Result(0, targetList, "查询完成！", c) } -//获取方案中的所有所有相关部们 +// 获取方案中的所有所有相关部们 func GetDutyFangAnDepart(dutyId int64, class int) (departId []int64, departAry []DepartmentAryType) { err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Select("qe_accept_evaluation").Where("`qe_state` = 1 AND `qe_target` = ? AND `qe_type` = ?", dutyId, class).Group("qe_accept_evaluation").Find(&departId).Error if err != nil { @@ -124,7 +124,7 @@ func GetDutyFangAnDepart(dutyId int64, class int) (departId []int64, departAry [ return } -//根据指标ID获取列表信息 +// 根据指标ID获取列表信息 func (d *DutyAssessApi) IdToTargetSunList(c *gin.Context) { var requestData commonus.SetIds err := c.ShouldBindJSON(&requestData) @@ -175,7 +175,7 @@ func (d *DutyAssessApi) IdToTargetSunList(c *gin.Context) { response.Result(0, targetCont, "查询完成！", c) } -//获取子指标和指标详情 +// 获取子指标和指标详情 func GetSunTargetList(targetId, demID int64, parAryId []int64) (cont []SunTargetListType) { var qualTargetCont []assessmentmodel.QualitativeTarget err := global.GVA_DB_Performanceappraisal.Where("`q_state` = 1 AND `q_parent_id` = ?", targetId).Find(&qualTargetCont).Error @@ -195,7 +195,7 @@ func GetSunTargetList(targetId, demID int64, parAryId []int64) (cont []SunTarget return } -//获取指标详情 +// 获取指标详情 func GetDetailTrager(targetId, detId, demID int64, parAryId []int64) (cont []DetailedTargetType) { var qualTargetCont []assessmentmodel.DetailedTarget err := global.GVA_DB_Performanceappraisal.Where("`dt_state` = 1 AND `dt_parentid` = ? AND `dt_parentid_sun` = ?", targetId, detId).Find(&qualTargetCont).Error @@ -212,7 +212,7 @@ func GetDetailTrager(targetId, detId, demID int64, parAryId []int64) (cont []Det return } -//获取执行人 +// 获取执行人 func GetOperator(dimID, tarId, sunTarId, detaId int64, parAryId []int64) (UserList []string, UserListAry []QualEvalArrt) { var qualEval []assessmentmodel.QualitativeEvaluation err := global.GVA_DB_Performanceappraisal.Where("`qe_state` = 1 AND `qe_dimension` = ? AND `qe_target` = ? AND `qe_target_sun` = ? AND `qe_detailed_target` = ? AND `qe_accept_evaluation` IN ?", dimID, tarId, sunTarId, detaId, parAryId).Find(&qualEval).Error @@ -243,7 +243,7 @@ func GetOperator(dimID, tarId, sunTarId, detaId int64, parAryId []int64) (UserLi return } -//获取定性指标->指标细则修改回显 +// 获取定性指标->指标细则修改回显 func (d *DutyAssessApi) GetDetailedTargetCallBack(c *gin.Context) { var requestData commonus.SetIds err := c.ShouldBindJSON(&requestData) @@ -304,7 +304,7 @@ func (d *DutyAssessApi) GetDetailedTargetCallBack(c *gin.Context) { response.Result(0, content, "获取成功！", c) } -//获取定性指标->指标细则修改回显 +// 获取定性指标->指标细则修改回显 func (d *DutyAssessApi) EiteDetailedTargetCallBack(c *gin.Context) { var requestData GetEiteTargetCont err := c.ShouldBindJSON(&requestData) @@ -335,7 +335,7 @@ func (d *DutyAssessApi) EiteDetailedTargetCallBack(c *gin.Context) { response.Result(0, err, "数据处理成功", c) } -//新增 +// 新增 func NewAddData(getData GetEiteTargetCont, oldData assessmentmodel.QualitativeEvaluation) (isTrue bool) { isTrue = false var detailedTargetInfo assessmentmodel.DetailedTarget @@ -378,7 +378,7 @@ func NewAddData(getData GetEiteTargetCont, oldData assessmentmodel.QualitativeEv return } -//修改 +// 修改 func NewEiteData(getData GetEiteTargetCont, oldData assessmentmodel.QualitativeEvaluation) (isTrue bool) { isTrue = false eiteDetailedInfo := commonus.MapOut() @@ -407,7 +407,7 @@ func NewEiteData(getData GetEiteTargetCont, oldData assessmentmodel.QualitativeE return } -//修改子栏目名称 +// 修改子栏目名称 func (d *DutyAssessApi) EiteSunTargetName(c *gin.Context) { var requestData EiteTargetContListSun err := c.ShouldBindJSON(&requestData) @@ -516,7 +516,7 @@ func (d *DutyAssessApi) EiteSunTargetName(c *gin.Context) { response.Result(0, err, "数据处理成功", c) } -//删除定性考核指标 +// 删除定性考核指标 func (d *DutyAssessApi) DelDutyTarget(c *gin.Context) { var requestData QualEvalArrt err := c.ShouldBindJSON(&requestData) @@ -539,7 +539,7 @@ func (d *DutyAssessApi) DelDutyTarget(c *gin.Context) { response.Result(0, err, "数据处理成功", c) } -//删除子栏目及附属指标详情 +// 删除子栏目及附属指标详情 func (d *DutyAssessApi) DelSunTarDimeat(c *gin.Context) { var requestData QualEvalArrt err := c.ShouldBindJSON(&requestData) @@ -579,7 +579,7 @@ func (d *DutyAssessApi) DelSunTarDimeat(c *gin.Context) { response.Result(0, err, "数据处理成功", c) } -//添加 定性考核指标关系指定 +// 添加 定性考核指标关系指定 func (d *DutyAssessApi) AddDutyRelationOld(c *gin.Context) { var requestData AddQualEval err := c.ShouldBindJSON(&requestData) @@ -826,7 +826,7 @@ func (d *DutyAssessApi) AddDutyRelationOld(c *gin.Context) { } } -//判断是否存在项目 +// 判断是否存在项目 func JudgeDeiScor(id int64, listCont []DutyAssEssTarget) (cont DutyAssEssTarget, isTrue bool) { isTrue = false for _, v := range listCont { @@ -838,7 +838,7 @@ func JudgeDeiScor(id int64, listCont []DutyAssEssTarget) (cont DutyAssEssTarget, return } -//获取定性考核指标关系指定列表 +// 获取定性考核指标关系指定列表 func (d *DutyAssessApi) GetDutyRelationList(c *gin.Context) { var targetAssessAry []assessmentmodel.Assesstarget errGroup := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Select("`group`,`dimension`,`targetid`").Group("`group`,`dimension`,`targetid`").Order("`group` ASC").Order("`dimension` ASC").Order("`targetid` ASC").Find(&targetAssessAry).Error @@ -948,7 +948,7 @@ func (d *DutyAssessApi) GetDutyRelationList(c *gin.Context) { // response.Result(0, outList, "查询完成！", c) } -//查看定性考核项目详情 +// 查看定性考核项目详情 func (d *DutyAssessApi) LookDutyTargetInfoOld(c *gin.Context) { var requestData LookTargetContList err := c.ShouldBindJSON(&requestData) @@ -1160,7 +1160,7 @@ func (d *DutyAssessApi) LookDutyTargetInfoOld(c *gin.Context) { } } -//删除考核指标 +// 删除考核指标 func (d *DutyAssessApi) NewDelTarGet(c *gin.Context) { var requestData LookTargetContList err := c.ShouldBindJSON(&requestData) @@ -1202,7 +1202,7 @@ func (d *DutyAssessApi) NewDelTarGet(c *gin.Context) { response.Result(0, delErr, "删除成功！", c) } -//执行附属软删除 +// 执行附属软删除 func assessAttbar(oldAssEssData []assessmentmodel.Assesstarget) { var targetId []int64 var targetSunId []int64 @@ -1249,7 +1249,7 @@ func assessAttbar(oldAssEssData []assessmentmodel.Assesstarget) { // panic(detaredTargetSunId) } -//获取被修改指标细则的详情 +// 获取被修改指标细则的详情 func (d *DutyAssessApi) GetNewEiteDetailedTarget(c *gin.Context) { var requestData GetDeitalTarCont err := c.ShouldBindJSON(&requestData) @@ -1362,7 +1362,7 @@ func (d *DutyAssessApi) GetNewEiteDetailedTarget(c *gin.Context) { } -//修改定性考核指标细则内容 +// 修改定性考核指标细则内容 func (d *DutyAssessApi) NewEiteDetailedTarget(c *gin.Context) { var requestData NewEiteDtyDiteCont err := c.ShouldBindJSON(&requestData) @@ -1529,7 +1529,7 @@ func (d *DutyAssessApi) NewEiteDetailedTarget(c *gin.Context) { } } -//删除指标 +// 删除指标 func (d *DutyAssessApi) NewDelDetailedTarget(c *gin.Context) { var requestData GetDeitalTarCont err := c.ShouldBindJSON(&requestData) @@ -1578,7 +1578,7 @@ func (d *DutyAssessApi) NewDelDetailedTarget(c *gin.Context) { response.Result(0, requestData, "修改完成！", c) } -//删除子栏目 +// 删除子栏目 func (d *DutyAssessApi) NewDelSunTarget(c *gin.Context) { var requestData GetDeitalTarCont err := c.ShouldBindJSON(&requestData) @@ -1624,7 +1624,7 @@ func (d *DutyAssessApi) NewDelSunTarget(c *gin.Context) { response.Result(0, requestData, "修改完成！", c) } -//新的部门考核指标获取列表 +// 新的部门考核指标获取列表 func (d *DutyAssessApi) NewGerDerpatTarList(c *gin.Context) { var requestData rationSelect c.ShouldBindJSON(&requestData) @@ -1707,7 +1707,7 @@ func GetTargetGroup(group, dimensionId, departID string) (contAry []DepartTarget return } -//部门考核添加。NEW +// 部门考核添加。NEW func (d *DutyAssessApi) NewAddDepartDuty(c *gin.Context) { var requestData AddDutyNewContGroup err := c.ShouldBindJSON(&requestData) @@ -2001,7 +2001,7 @@ func (d *DutyAssessApi) NewAddDepartDuty(c *gin.Context) { response.Result(0, saveDataAry, "数据添加成功", c) } -//获取考核方法要修改的数据 +// 获取考核方法要修改的数据 func (d *DutyAssessApi) GetEiteSunTarterInfo(c *gin.Context) { var requestData LookTargetContListSun err := c.ShouldBindJSON(&requestData) @@ -2046,7 +2046,7 @@ func (d *DutyAssessApi) GetEiteSunTarterInfo(c *gin.Context) { response.Result(0, userAry, "没有数据", c) } -//修改考核方法指标审核人 +// 修改考核方法指标审核人 func (d *DutyAssessApi) EiteSunTarterInfoUser(c *gin.Context) { var requestData EiteTargetContListSun err := c.ShouldBindJSON(&requestData) diff --git a/api/index/statistics/queryresults.go b/api/index/statistics/queryresults.go index 1ce4547..5c1292c 100644 --- a/api/index/statistics/queryresults.go +++ b/api/index/statistics/queryresults.go @@ -98,7 +98,7 @@ func (a *ApiGroup) Queryresults(c *gin.Context) { } syncProcess.Wait() //等待所有协程完毕 readStatisticsData := deaprtmenTranscript.readTranscriptData() //读取通道数据 - fmt.Printf("readStatisticsData----------->%v\n", readStatisticsData) + // fmt.Printf("readStatisticsData----------->%v\n", readStatisticsData) var AScore float64 = 0 var BScore float64 = 0 @@ -423,7 +423,7 @@ func (t *TranscriptTableData) StaticticsDepartmentResult(group string, orgCont h syncProcessDepartTarget.Wait() everyMonthScoreList := everyMonthScore.readMyDayData() for _, emslv := range everyMonthScoreList { - fmt.Printf("emslv---->%v\n", emslv) + // fmt.Printf("emslv---->%v\n", emslv) switch emslv.MonthVal { case 1: pingJunFen.A = emslv.Score diff --git a/api/v1/assessment/target.go b/api/v1/assessment/target.go index 0990caf..321c0f2 100644 --- a/api/v1/assessment/target.go +++ b/api/v1/assessment/target.go @@ -16,7 +16,7 @@ import ( "github.com/gin-gonic/gin" ) -//获取指标列表 +// 获取指标列表 func (d *DutyHandle) GetTargetList(c *gin.Context) { var requestData listTarget err := c.ShouldBindJSON(&requestData) @@ -215,7 +215,7 @@ func (d *DutyHandle) GetTargetList(c *gin.Context) { response.Result(0, printData, "查询成功！", c) } -//添加指标 +// 添加指标 func (d *DutyHandle) AddTarget(c *gin.Context) { var requestData addTargetType err := c.ShouldBindJSON(&requestData) @@ -260,7 +260,7 @@ func (d *DutyHandle) AddTarget(c *gin.Context) { gormDb = gormDb.Where("`et_dimension` = ?", requestData.Dimension) } judgeOut := commonus.MapOut() - judgeErr := gormDb.First(&judgeOut) + judgeErr := gormDb.First(&judgeOut).Error if judgeErr == nil { response.Result(105, err, "此考核指标已经存在！请不要重复添加！", c) return @@ -300,7 +300,7 @@ func (d *DutyHandle) AddTarget(c *gin.Context) { } } -//计算可见范围 +// 计算可见范围 func calculVisibleRange(groupStr, depart []string) (visibleRange string) { if len(depart) > 0 { for d_index, d_val := range depart { @@ -326,7 +326,7 @@ func calculVisibleRange(groupStr, depart []string) (visibleRange string) { return } -//获得分厂列表 +// 获得分厂列表 func getBranchFactoryList(id string) (bfIdStr string) { var ContInfo []testpage.BranchFactory err := global.GVA_DB_Master.Select("bf_id").Where("bf_group = ? AND `bf_set` = 1", id).Find(&ContInfo).Error @@ -343,7 +343,7 @@ func getBranchFactoryList(id string) (bfIdStr string) { return } -//获取考核指标详情 +// 获取考核指标详情 func (d *DutyHandle) GetTarget(c *gin.Context) { var requestData commonus.SetIds err := c.ShouldBindJSON(&requestData) @@ -385,7 +385,7 @@ func (d *DutyHandle) GetTarget(c *gin.Context) { response.Result(0, systemEvalCont, "数据获取成功！", c) } -//编辑指标数据处理 +// 编辑指标数据处理 func eiteTargetInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { isTrue = false infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Where("`et_id` = ?", saveId).Updates(saveData).Error @@ -396,7 +396,7 @@ func eiteTargetInfoes(saveId int64, saveData map[string]interface{}) (isTrue boo return } -//删除工段内容 +// 删除工段内容 func (d *DutyHandle) DelTarget(c *gin.Context) { var requestData dutyClassState err := c.ShouldBindJSON(&requestData) @@ -456,7 +456,7 @@ func (d *DutyHandle) DelTarget(c *gin.Context) { } } -//修改指标内容 +// 修改指标内容 func (d *DutyHandle) EiteTarget(c *gin.Context) { var requestData eiteTargetTypeCont err := c.ShouldBindJSON(&requestData) diff --git a/config.yaml b/config.yaml index 761b644..6f26991 100644 --- a/config.yaml +++ b/config.yaml @@ -294,7 +294,7 @@ mysqlApprovalProcess: mysqlPerformanceappraisal: path: '127.0.0.1:3306' config: 'charset=utf8mb4&parseTime=True&loc=Local' - db-name: 'performanceappraisal' + db-name: 'perform' username: 'root' password: 'root' max-idle-conns: 100 @@ -319,7 +319,7 @@ mysqlWechatCallBack: hrdatabase: path: '127.0.0.1:3306' config: 'charset=utf8mb4&parseTime=True&loc=Local' - db-name: 'human_resources_jindie' + db-name: 'hr_new' username: 'root' password: 'root' max-idle-conns: 100