Browse Source

修改工作流

v1_dev_2
超级管理员 2 years ago
parent
commit
67bb9dbf4d
  1. 5
      api/version1/departmentseting/departmentpc/dingliang.go
  2. 10
      api/workflow/workflowengine/flowhandle.go

5
api/version1/departmentseting/departmentpc/dingliang.go

@ -77,10 +77,14 @@ func (a *ApiMethod) GetQuantitativeTasks(c *gin.Context) {
publicmethod.Result(1, qualEvaList, c, "您没有要参加的考核项目!") publicmethod.Result(1, qualEvaList, c, "您没有要参加的考核项目!")
return return
} }
var idInAry []int64
var sendListCont []TargetContOutCont var sendListCont []TargetContOutCont
for _, vsss := range qualEvaList { for _, vsss := range qualEvaList {
var v modelskpi.QualitativeEvaluation var v modelskpi.QualitativeEvaluation
v.GetCont(map[string]interface{}{"`qe_accept_evaluation`": vsss.AcceptEvaluation, "`qe_target`": vsss.Target, "`qe_state`": 1}) v.GetCont(map[string]interface{}{"`qe_accept_evaluation`": vsss.AcceptEvaluation, "`qe_target`": vsss.Target, "`qe_state`": 1})
if !publicmethod.IsInTrue[int64](v.Id, idInAry) {
idInAry = append(idInAry, v.Id)
var sendCont TargetContOutCont var sendCont TargetContOutCont
sendCont.Id = strconv.FormatInt(v.Id, 10) sendCont.Id = strconv.FormatInt(v.Id, 10)
sendCont.Type = v.Type sendCont.Type = v.Type
@ -270,6 +274,7 @@ func (a *ApiMethod) GetQuantitativeTasks(c *gin.Context) {
// } // }
sendListCont = append(sendListCont, sendCont) sendListCont = append(sendListCont, sendCont)
} }
}
publicmethod.Result(0, sendListCont, c) publicmethod.Result(0, sendListCont, c)
} }

10
api/workflow/workflowengine/flowhandle.go

@ -93,7 +93,15 @@ func (a *ApiMethod) GetAllParentNode(c *gin.Context) {
} }
var outCont outAllNodeCont var outCont outAllNodeCont
outCont.SeekFromNodeCont(receivedValue.Id, receivedValue.AllCont) outCont.SeekFromNodeCont(receivedValue.Id, receivedValue.AllCont)
sendCont.AllCont = outCont.AllCont var daoXun []NodePublicStruct
contLen := len(outCont.AllCont)
if contLen > 0 {
for i := contLen - 1; i >= 0; i-- {
daoXun = append(daoXun, outCont.AllCont[i])
}
}
sendCont.AllCont = daoXun
sendCont.Total = len(outCont.AllCont) sendCont.Total = len(outCont.AllCont)
publicmethod.Result(0, sendCont, c) publicmethod.Result(0, sendCont, c)
} }

Loading…
Cancel
Save