|
|
|
@ -51,7 +51,11 @@ type Approval struct {
|
|
|
|
|
BundlePayPrice *BundlePayPrice `gorm:"foreignKey:ApprovalID" json:"BundlePayPrice"` //关联的type
|
|
|
|
|
ExhibitionReward *ExhibitionReward `gorm:"foreignKey:ApprovalID" json:"ExhibitionReward"` //关联的type
|
|
|
|
|
ApprovalWorkFlows []*ApprovalWorkFlow `gorm:"foreignKey:ApprovalID" json:"ApprovalWorkFlows"`
|
|
|
|
|
<<<<<<< Updated upstream
|
|
|
|
|
ApprovalOA *ApprovalOA `gorm:"foreignKey:ApprovalID" json:"OA"`
|
|
|
|
|
=======
|
|
|
|
|
ApprovalOA *ApprovalOA `gorm:"foreignKey:ApprovalID" json:"oa"`
|
|
|
|
|
>>>>>>> Stashed changes
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (j *KeyInfos) Scan(src interface{}) error {
|
|
|
|
@ -73,6 +77,24 @@ const (
|
|
|
|
|
TypeBundle = "bundle"
|
|
|
|
|
TypeBundlePayPrice = "bundlePayPrice"
|
|
|
|
|
TypeArtExhibitionReward = "artExhibitionReward"
|
|
|
|
|
TypeOa = "oa" // oa 父类
|
|
|
|
|
/* 子类 */
|
|
|
|
|
TypeOaLeave = "oa_leave" // 事假
|
|
|
|
|
TypeOaSick = "oa_sick" // 病假
|
|
|
|
|
TypeOaAnnualLeave = "oa_annualLeave" // 年假
|
|
|
|
|
TypeOaDayOff = "oa_dayOff" // 调休
|
|
|
|
|
TypeOaMaritalLeave = "oa_maritalLeave" // 婚假
|
|
|
|
|
TypeOaMatingCheckLeave = "oa_matingCheckLeave" // 孕检假
|
|
|
|
|
TypeOaMaternityLeave = "oa_maternityLeave" // 产假
|
|
|
|
|
TypeOaPaternityLeave = "oa_paternityLeave" // 陪产假
|
|
|
|
|
TypeOaParentalLeave = "oa_parentalLeave" // 育儿假
|
|
|
|
|
TypeOaNursingLeave = "oa_nursingLeave" // 独生子女护理假
|
|
|
|
|
TypeOaFuneralLeave = "oa_funeralLeave" // 丧假
|
|
|
|
|
TypeOaMakeUp = "oa_makeUp" // 补卡
|
|
|
|
|
TypeOaOvertime = "oa_overtime" // 加班
|
|
|
|
|
TypeOaOutwork = "oa_outwork" // 外勤
|
|
|
|
|
TypeOaTurnover = "oa_turnover" // 离职
|
|
|
|
|
/* */
|
|
|
|
|
)
|
|
|
|
|
const (
|
|
|
|
|
StatusDoing = 1
|
|
|
|
@ -542,7 +564,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
|
|
|
|
|
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))) // 已完成,抄送给我的
|
|
|
|
|
modelObj.Count(&count)
|
|
|
|
|
|
|
|
|
|
if len(ids) > 0 { //根据具体id排序
|
|
|
|
@ -587,8 +609,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))) //抄送人(完成抄送)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -644,8 +666,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))) //抄送人(完成抄送)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|