|
|
|
@ -590,6 +590,10 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
Preload("FinancialForm").
|
|
|
|
|
Preload("ApprovalOA")
|
|
|
|
|
|
|
|
|
|
fmt.Println("list request :==================== start ===================")
|
|
|
|
|
fmt.Println(" value ", in)
|
|
|
|
|
fmt.Println("list request :==================== end ===================")
|
|
|
|
|
|
|
|
|
|
//我未阅读的和我未操作的
|
|
|
|
|
queryApproval := &Approval{NowUserId: in.UserID}
|
|
|
|
|
|
|
|
|
@ -629,7 +633,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
if in.ApprovalStatus == 0 {
|
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
|
|
|
|
|
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
|
|
|
|
|
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的
|
|
|
|
|
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的
|
|
|
|
|
} else {
|
|
|
|
|
sonQuery := DB.Where(queryApproval)
|
|
|
|
|
if in.ApprovalStatus > StatusFail {
|
|
|
|
@ -685,8 +689,8 @@ func MyApprovalWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
if in.UserID != 0 {
|
|
|
|
|
modelObj = modelObj.Where(
|
|
|
|
|
DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID).
|
|
|
|
|
Where("status != ?", StatusDoing). //完成,我参与审批
|
|
|
|
|
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中,当前审批人是我,
|
|
|
|
|
Where("status != ?", StatusDoing). //完成,我参与审批
|
|
|
|
|
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中,当前审批人是我,
|
|
|
|
|
Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -752,8 +756,8 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
if in.UserID != 0 {
|
|
|
|
|
modelObj = modelObj.Where(
|
|
|
|
|
DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID).
|
|
|
|
|
Where("status != ?", StatusDoing). //完成,我参与审批
|
|
|
|
|
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中,当前审批人是我,
|
|
|
|
|
Where("status != ?", StatusDoing). //完成,我参与审批
|
|
|
|
|
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中,当前审批人是我,
|
|
|
|
|
Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|