herenshan112
/
gin_server_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

变更

master
超级管理员 3 years ago
parent
ab71b506d1
commit
f1a1e6bce9
6 changed files with 52 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      api/admin/dutyassess/assess.go
  2. 24
      api/admin/dutyassess/planversio.go
  3. 4
      api/statistics/quantification/summary_details.go
  4. BIN
      api/v1/positionkpi/__debug_bin.exe
  5. 8
      api/v1/positionkpi/postscheme.go
  6. 10
      api/v1/shiyan/shiyan.go

42
api/admin/dutyassess/assess.go
View File

@ -17,13 +17,13 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//入口 // 入口
func (d *DutyAssessApi) Index(c *gin.Context) { func (d *DutyAssessApi) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "管理端获取成功", c) response.Result(0, outPut, "管理端获取成功", c)
} }
//获取部门被考核时间表 // 获取部门被考核时间表
func (d *DutyAssessApi) GetDepartEvaluate(c *gin.Context) { func (d *DutyAssessApi) GetDepartEvaluate(c *gin.Context) {
isTrue, userCont := commonus.AdminClientIdentity() isTrue, userCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -151,7 +151,7 @@ func (d *DutyAssessApi) GetDepartEvaluate(c *gin.Context) {
response.Result(0, printData, "查询成功！", c) response.Result(0, printData, "查询成功！", c)
} }
//获取部门考核列表 // 获取部门考核列表
func (d *DutyAssessApi) GetDepartmentAssessList(c *gin.Context) { func (d *DutyAssessApi) GetDepartmentAssessList(c *gin.Context) {
var requestData getDepartAssObtains var requestData getDepartAssObtains
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -263,7 +263,7 @@ func (d *DutyAssessApi) GetDepartmentAssessList(c *gin.Context) {
} }
//获取集团下属分厂 // 获取集团下属分厂
func getGroupDepartIdMap(groupId int64) (isTrue bool, departId getGroupDepart) { func getGroupDepartIdMap(groupId int64) (isTrue bool, departId getGroupDepart) {
isTrue = false isTrue = false
err, departCont := examtestpage.GetBranchFactoryMap(groupId) err, departCont := examtestpage.GetBranchFactoryMap(groupId)
@ -278,7 +278,7 @@ func getGroupDepartIdMap(groupId int64) (isTrue bool, departId getGroupDepart) {
return return
} }
//获取考核项目列表 // 获取考核项目列表
func GetAssList(classId, depart, timeVal int64) (isTrue bool, departMonthAss []departMonthSun) { func GetAssList(classId, depart, timeVal int64) (isTrue bool, departMonthAss []departMonthSun) {
isTrue = false isTrue = false
var departScorsList []assessmentmodel.Departscores var departScorsList []assessmentmodel.Departscores
@ -304,7 +304,7 @@ func GetAssList(classId, depart, timeVal int64) (isTrue bool, departMonthAss []d
return return
} }
//获取具体考核项目 // 获取具体考核项目
func GetDetailedDuty(classId, assId, depart, timeVal int64) (isTrue bool, departMonthUser []departMonthSun) { func GetDetailedDuty(classId, assId, depart, timeVal int64) (isTrue bool, departMonthUser []departMonthSun) {
isTrue = false isTrue = false
var departScorsList []commentUser var departScorsList []commentUser
@ -339,7 +339,7 @@ func GetDetailedDuty(classId, assId, depart, timeVal int64) (isTrue bool, depart
return return
} }
//获取考核具体职责项目 // 获取考核具体职责项目
func GetDutyContAry(classId, assId, depart, userKey, timeVal int64) (isTrue bool, dutyList []departDutyList) { func GetDutyContAry(classId, assId, depart, userKey, timeVal int64) (isTrue bool, dutyList []departDutyList) {
// fmt.Printf("--->%v--->%v\n", classId, assId) // fmt.Printf("--->%v--->%v\n", classId, assId)
isTrue = false isTrue = false
@ -377,7 +377,7 @@ func GetDutyContAry(classId, assId, depart, userKey, timeVal int64) (isTrue bool
return return
} }
//获取职责类别内容 // 获取职责类别内容
func GetDutyInfoCont(id int64) (isTrue bool, outAssDutyInfo outAessDuty) { func GetDutyInfoCont(id int64) (isTrue bool, outAssDutyInfo outAessDuty) {
isTrue = false isTrue = false
var ContInfo dutyAssClass var ContInfo dutyAssClass
@ -397,7 +397,7 @@ func GetDutyInfoCont(id int64) (isTrue bool, outAssDutyInfo outAessDuty) {
return return
} }
//查看定量考核目标设定 // 查看定量考核目标设定
func (e *DutyAssessApi) LookQuantitativeConfig(c *gin.Context) { func (e *DutyAssessApi) LookQuantitativeConfig(c *gin.Context) {
var requestData SelectQuantitativeConfig var requestData SelectQuantitativeConfig
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -508,7 +508,7 @@ func (e *DutyAssessApi) LookQuantitativeConfig(c *gin.Context) {
response.Result(0, outList, "获取成功！", c) response.Result(0, outList, "获取成功！", c)
} }
//删除部门考核指标(New) // 删除部门考核指标(New)
func (d *DutyAssessApi) DelDepartDutyTarger(c *gin.Context) { func (d *DutyAssessApi) DelDepartDutyTarger(c *gin.Context) {
var requestData DelDutyDepartTarget var requestData DelDutyDepartTarget
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -544,7 +544,7 @@ func (d *DutyAssessApi) DelDepartDutyTarger(c *gin.Context) {
response.Result(0, eiteCont, "处理成功", c) response.Result(0, eiteCont, "处理成功", c)
} }
//删除部门考核方案 // 删除部门考核方案
func (d *DutyAssessApi) DelDepartDuty(c *gin.Context) { func (d *DutyAssessApi) DelDepartDuty(c *gin.Context) {
var requestData DelDutyDepartTarget var requestData DelDutyDepartTarget
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -572,7 +572,7 @@ func (d *DutyAssessApi) DelDepartDuty(c *gin.Context) {
response.Result(0, eiteCont, "处理成功", c) response.Result(0, eiteCont, "处理成功", c)
} }
//获取定性考核相关部门 // 获取定性考核相关部门
func (d *DutyAssessApi) GetDepartForDuty(c *gin.Context) { func (d *DutyAssessApi) GetDepartForDuty(c *gin.Context) {
var requestData LookTargetContList var requestData LookTargetContList
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -653,7 +653,7 @@ func (d *DutyAssessApi) GetDepartForDuty(c *gin.Context) {
response.Result(0, outInfor, "获取成功！", c) response.Result(0, outInfor, "获取成功！", c)
} }
//修改已知定性考核指标关联部门 // 修改已知定性考核指标关联部门
func (d *DutyAssessApi) EiteDepartForDuty(c *gin.Context) { func (d *DutyAssessApi) EiteDepartForDuty(c *gin.Context) {
var requestData EiteDutyForDepart var requestData EiteDutyForDepart
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -723,7 +723,7 @@ func (d *DutyAssessApi) EiteDepartForDuty(c *gin.Context) {
response.Result(0, sunTargetId, "编辑成功！", c) response.Result(0, sunTargetId, "编辑成功！", c)
} }
//查看考核方案 // 查看考核方案
func (d *DutyAssessApi) LookDepartDutyVersio(c *gin.Context) { func (d *DutyAssessApi) LookDepartDutyVersio(c *gin.Context) {
var requestData LookDutyVersio var requestData LookDutyVersio
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -748,9 +748,9 @@ func (d *DutyAssessApi) LookDepartDutyVersio(c *gin.Context) {
var planVersioInfo []AddDutyNewCont var planVersioInfo []AddDutyNewCont
jsonErr := json.Unmarshal([]byte(assessTargetContent.Content), &planVersioInfo) jsonErr := json.Unmarshal([]byte(assessTargetContent.Content), &planVersioInfo)
if jsonErr == nil { if jsonErr == nil {
for _, pv := range planVersioInfo { for _, pv := range planVersioInfo { //维度
for _, pvChild := range pv.Child { for _, pvChild := range pv.Child { //指标
if pvChild.Status == 1 || pvChild.Status == 3 { if pvChild.Status == 1 || pvChild.Status == 3 { //判断是不是禁止指标
var uotCont TargetContOutCont var uotCont TargetContOutCont
//集团 //集团
uotCont.Group = strconv.FormatInt(assessTargetContent.Group, 10) uotCont.Group = strconv.FormatInt(assessTargetContent.Group, 10)
@ -921,7 +921,7 @@ func getQualEvalUser(key, dimensionId, targetId string) (userContAry []QualEvalA
return return
} }
//获取部门考核项目 // 获取部门考核项目
func getLookAssessQualEvalList(Key string) (uotContAry []TargetContOutCont, errMsg bool) { func getLookAssessQualEvalList(Key string) (uotContAry []TargetContOutCont, errMsg bool) {
errMsg = false errMsg = false
var qualitativeEvaluationAry []assessmentmodel.QualitativeEvaluation var qualitativeEvaluationAry []assessmentmodel.QualitativeEvaluation
@ -1048,7 +1048,7 @@ func getLookAssessQualEvalList(Key string) (uotContAry []TargetContOutCont, errM
return return
} }
//查看考核方案 // 查看考核方案
func (d *DutyAssessApi) CopyDepartDutyVersio(c *gin.Context) { func (d *DutyAssessApi) CopyDepartDutyVersio(c *gin.Context) {
var requestData LookDutyVersio var requestData LookDutyVersio
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -1155,7 +1155,7 @@ func (d *DutyAssessApi) CopyDepartDutyVersio(c *gin.Context) {
response.Result(0, copyCont, "查询完成！", c) response.Result(0, copyCont, "查询完成！", c)
} }
//修改考核目标设置 // 修改考核目标设置
func (e *DutyAssessApi) EiteQuantitativeConfig(c *gin.Context) { func (e *DutyAssessApi) EiteQuantitativeConfig(c *gin.Context) {
var requestData []EiteQuantConfig var requestData []EiteQuantConfig
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -1181,7 +1181,7 @@ func (e *DutyAssessApi) EiteQuantitativeConfig(c *gin.Context) {
} }
} }
//修改考核目标设置 // 修改考核目标设置
func (e *DutyAssessApi) DelQuantitativeConfig(c *gin.Context) { func (e *DutyAssessApi) DelQuantitativeConfig(c *gin.Context) {
var requestData []string var requestData []string
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

24
api/admin/dutyassess/planversio.go
View File

@ -14,7 +14,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//获取正在激活的考核方案 // 获取正在激活的考核方案
func (d *DutyAssessApi) GetActivationPlanVersion(c *gin.Context) { func (d *DutyAssessApi) GetActivationPlanVersion(c *gin.Context) {
var requestData DutyPlanVersio var requestData DutyPlanVersio
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -39,7 +39,7 @@ func (d *DutyAssessApi) GetActivationPlanVersion(c *gin.Context) {
response.Result(0, planVersio, "获取成功", c) response.Result(0, planVersio, "获取成功", c)
} }
//部门考核方案版本列表 // 部门考核方案版本列表
func (d *DutyAssessApi) DepartDutyPlanVersion(c *gin.Context) { func (d *DutyAssessApi) DepartDutyPlanVersion(c *gin.Context) {
var requestData DutyPlanVersio var requestData DutyPlanVersio
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -96,7 +96,7 @@ func (d *DutyAssessApi) DepartDutyPlanVersion(c *gin.Context) {
response.Result(0, planVersio, "获取成功", c) response.Result(0, planVersio, "获取成功", c)
} }
//添加部门考核方案（待版本号的版本） // 添加部门考核方案（待版本号的版本）
func (d *DutyAssessApi) AddDepartDutyVersio(c *gin.Context) { func (d *DutyAssessApi) AddDepartDutyVersio(c *gin.Context) {
var requestData AddDutyNewContGroup var requestData AddDutyNewContGroup
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -432,7 +432,7 @@ func (d *DutyAssessApi) AddDepartDutyVersio(c *gin.Context) {
// response.Result(0, saveDataAry, "添加成功！", c) // response.Result(0, saveDataAry, "添加成功！", c)
} }
//查看考核方案 // 查看考核方案
func (d *DutyAssessApi) LookDepartDutyVersioOld(c *gin.Context) { func (d *DutyAssessApi) LookDepartDutyVersioOld(c *gin.Context) {
var requestData LookDutyVersio var requestData LookDutyVersio
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -568,7 +568,7 @@ func (d *DutyAssessApi) LookDepartDutyVersioOld(c *gin.Context) {
response.Result(0, uotContAry, "数据获取成功！", c) response.Result(0, uotContAry, "数据获取成功！", c)
} }
//启用禁用删除 // 启用禁用删除
func (d *DutyAssessApi) OnOffDepartDutyVersio(c *gin.Context) { func (d *DutyAssessApi) OnOffDepartDutyVersio(c *gin.Context) {
var requestData SetOnOffDutyVersio var requestData SetOnOffDutyVersio
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -643,7 +643,7 @@ func (d *DutyAssessApi) OnOffDepartDutyVersio(c *gin.Context) {
response.Result(0, errOne, "修改成功", c) response.Result(0, errOne, "修改成功", c)
} }
//判断是否可以执行启用禁用操作 // 判断是否可以执行启用禁用操作
func judgeOnOffVersio(contInfo assessmentmodel.PlanVersio, onOff int) (isTrue bool) { func judgeOnOffVersio(contInfo assessmentmodel.PlanVersio, onOff int) (isTrue bool) {
isTrue = false isTrue = false
if onOff == 1 { if onOff == 1 {
@ -663,7 +663,7 @@ func judgeOnOffVersio(contInfo assessmentmodel.PlanVersio, onOff int) (isTrue bo
return return
} }
//查询 // 查询
func selectServio(key string) (isTrue bool) { func selectServio(key string) (isTrue bool) {
isTrue = false isTrue = false
fmt.Printf("HGJK--------1---------->%v", key) fmt.Printf("HGJK--------1---------->%v", key)
@ -697,7 +697,7 @@ func selectServio(key string) (isTrue bool) {
return return
} }
//并发查询定性考核方案 // 并发查询定性考核方案
func (d *dataLockStatistics) SelectDutyVersioProcessXing(departId []int64) { func (d *dataLockStatistics) SelectDutyVersioProcessXing(departId []int64) {
d.mutext.Lock() d.mutext.Lock()
defer d.mutext.Unlock() defer d.mutext.Unlock()
@ -719,7 +719,7 @@ func (d *dataLockStatistics) SelectDutyVersioProcessXing(departId []int64) {
syncProcess.Done() syncProcess.Done()
} }
//并发查询定量考核方案 // 并发查询定量考核方案
func (d *dataLockStatistics) SelectDutyVersioProcessLing(departId []int64) { func (d *dataLockStatistics) SelectDutyVersioProcessLing(departId []int64) {
d.mutext.Lock() d.mutext.Lock()
defer d.mutext.Unlock() defer d.mutext.Unlock()
@ -741,7 +741,7 @@ func (d *dataLockStatistics) SelectDutyVersioProcessLing(departId []int64) {
syncProcess.Done() syncProcess.Done()
} }
//修改部门考核方案内的说明 // 修改部门考核方案内的说明
func (d *DutyAssessApi) EiteDepartExplain(c *gin.Context) { func (d *DutyAssessApi) EiteDepartExplain(c *gin.Context) {
var requestData EitrDepartExplan var requestData EitrDepartExplan
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -774,7 +774,7 @@ func (d *DutyAssessApi) EiteDepartExplain(c *gin.Context) {
eiteData["qe_eitetime"] = time.Now().Unix() eiteData["qe_eitetime"] = time.Now().Unix()
eiteData["qe_content"] = requestData.Content eiteData["qe_content"] = requestData.Content
if requestData.State > 0 { if requestData.State > 0 {
eiteData["qe_state"] = requestData.State // eiteData["qe_state"] = requestData.State
eiteData["observer"] = requestData.State eiteData["observer"] = requestData.State
} else { } else {
eiteData["qe_state"] = 2 eiteData["qe_state"] = 2
@ -794,7 +794,7 @@ func (d *DutyAssessApi) EiteDepartExplain(c *gin.Context) {
} }
} }
//编辑版本主体 // 编辑版本主体
func eitePlanVersion(key string, tarId string, state int, contStr string) { func eitePlanVersion(key string, tarId string, state int, contStr string) {
var planVersioCont assessmentmodel.PlanVersio var planVersioCont assessmentmodel.PlanVersio
planErr := global.GVA_DB_Performanceappraisal.Where("`key` = ?", key).First(&planVersioCont).Error planErr := global.GVA_DB_Performanceappraisal.Where("`key` = ?", key).First(&planVersioCont).Error

4
api/statistics/quantification/summary_details.go
View File

@ -529,7 +529,7 @@ func (a *ApiGroup) SummaryDetailsXingLog(c *gin.Context) {
requestData.Months = 12 requestData.Months = 12
} }
var scoreFlowList []assessmentmodel.ScoreFlow 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 { if minusErr != nil {
response.Result(105, minusErr, "没有数据", c) response.Result(105, minusErr, "没有数据", c)
return return
@ -556,7 +556,7 @@ func (a *ApiGroup) SummaryDetailsXingLog(c *gin.Context) {
flowScoreCont.EvalUserCont = append(flowScoreCont.EvalUserCont, evalUser) flowScoreCont.EvalUserCont = append(flowScoreCont.EvalUserCont, evalUser)
flowScoreList = append(flowScoreList, flowScoreCont) flowScoreList = append(flowScoreList, flowScoreCont)
} }
response.Result(0, flowScoreList, "没有数据", c) response.Result(0, flowScoreList, "查询成功", c)
} }
// 定性月份分值合计 // 定性月份分值合计

BIN
api/v1/positionkpi/__debug_bin.exe
View File

Binary file not shown.

8
api/v1/positionkpi/postscheme.go
View File

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

10
api/v1/shiyan/shiyan.go
View File

@ -2967,10 +2967,17 @@ func (s *ShiyanApi) DelFlowDataUser(c *gin.Context) {
if len(flowKey) > 0 { if len(flowKey) > 0 {
global.GVA_DB_Performanceappraisal.Where("fld_flow_log IN ?", flowKey).Delete(&assessmentmodel.FlowLogData{}) 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("fl_key IN ?", flowKey).Delete(&assessmentmodel.FlowLog{})
global.GVA_DB_Performanceappraisal.Where("ep_order_key IN ?", flowKey).Delete(&assessmentmodel.EvaluationProcess{})
} }
} }
//定性审核 //定性审核
global.GVA_DB_Performanceappraisal.Where("sf_evaluation_user = ?", requestData.Id).Delete(&assessmentmodel.ScoreFlow{}) 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) 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 delErr := global.GVA_DB_Performanceappraisal.Where("fld_flow_log = ?", v).First(&flowData).Error
if delErr != nil { if delErr != nil {
global.GVA_DB_Performanceappraisal.Where("fl_key = ?", v).Delete(&assessmentmodel.FlowLog{}) global.GVA_DB_Performanceappraisal.Where("fl_key = ?", v).Delete(&assessmentmodel.FlowLog{})
global.GVA_DB_Performanceappraisal.Where("ep_order_key = ?", v).Delete(&assessmentmodel.EvaluationProcess{})
} }
} }
} }

Write Preview
Loading…
Cancel
Save