|
|
@ -51,6 +51,7 @@ type Approval struct {
|
|
|
|
BundlePayPrice *BundlePayPrice `gorm:"foreignKey:ApprovalID" json:"BundlePayPrice"` //关联的type
|
|
|
|
BundlePayPrice *BundlePayPrice `gorm:"foreignKey:ApprovalID" json:"BundlePayPrice"` //关联的type
|
|
|
|
ExhibitionReward *ExhibitionReward `gorm:"foreignKey:ApprovalID" json:"ExhibitionReward"` //关联的type
|
|
|
|
ExhibitionReward *ExhibitionReward `gorm:"foreignKey:ApprovalID" json:"ExhibitionReward"` //关联的type
|
|
|
|
ApprovalWorkFlows []*ApprovalWorkFlow `gorm:"foreignKey:ApprovalID" json:"ApprovalWorkFlows"`
|
|
|
|
ApprovalWorkFlows []*ApprovalWorkFlow `gorm:"foreignKey:ApprovalID" json:"ApprovalWorkFlows"`
|
|
|
|
|
|
|
|
FinancialFrom []*FinancialFrom `gorm:"foreignKey:ApprovalID" json:"financialFrom"`
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (j *KeyInfos) Scan(src interface{}) error {
|
|
|
|
func (j *KeyInfos) Scan(src interface{}) error {
|
|
|
@ -72,6 +73,7 @@ const (
|
|
|
|
TypeBundle = "bundle"
|
|
|
|
TypeBundle = "bundle"
|
|
|
|
TypeBundlePayPrice = "bundlePayPrice"
|
|
|
|
TypeBundlePayPrice = "bundlePayPrice"
|
|
|
|
TypeArtExhibitionReward = "artExhibitionReward"
|
|
|
|
TypeArtExhibitionReward = "artExhibitionReward"
|
|
|
|
|
|
|
|
TypeFinancialForm = "financialFormApply"
|
|
|
|
)
|
|
|
|
)
|
|
|
|
const (
|
|
|
|
const (
|
|
|
|
StatusDoing = 1
|
|
|
|
StatusDoing = 1
|
|
|
@ -532,10 +534,9 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
Preload("BundlePayPrice").
|
|
|
|
Preload("BundlePayPrice").
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("ExhibitionReward.ApprovalExhibitions").
|
|
|
|
Preload("ExhibitionReward.ApprovalExhibitions").
|
|
|
|
Preload("ApprovalWorkFlows", func(db *gorm.DB) *gorm.DB {
|
|
|
|
Preload("ApprovalWorkFlows").
|
|
|
|
return db.Order("level asc")
|
|
|
|
Preload("Exhibition.ApprovalExhibitions").
|
|
|
|
}).
|
|
|
|
Preload("FinancialFrom")
|
|
|
|
Preload("Exhibition.ApprovalExhibitions")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//我未阅读的和我未操作的
|
|
|
|
//我未阅读的和我未操作的
|
|
|
|
DB.Model(&Approval{}).Where(&Approval{Type: in.Type}).Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}).Order("id desc").Select("id").Find(&ids)
|
|
|
|
DB.Model(&Approval{}).Where(&Approval{Type: in.Type}).Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}).Order("id desc").Select("id").Find(&ids)
|
|
|
@ -572,7 +573,8 @@ func MyApprovalWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
Preload("BundlePayPrice").
|
|
|
|
Preload("BundlePayPrice").
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("ApprovalWorkFlows").
|
|
|
|
Preload("ApprovalWorkFlows").
|
|
|
|
Preload("Exhibition.ApprovalExhibitions")
|
|
|
|
Preload("Exhibition.ApprovalExhibitions").
|
|
|
|
|
|
|
|
Preload("FinancialFrom")
|
|
|
|
|
|
|
|
|
|
|
|
if in.Type != "" {
|
|
|
|
if in.Type != "" {
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
@ -629,7 +631,8 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("ExhibitionReward.ApprovalExhibitions").
|
|
|
|
Preload("ExhibitionReward.ApprovalExhibitions").
|
|
|
|
Preload("ApprovalWorkFlows").
|
|
|
|
Preload("ApprovalWorkFlows").
|
|
|
|
Preload("Exhibition.ApprovalExhibitions")
|
|
|
|
Preload("Exhibition.ApprovalExhibitions").
|
|
|
|
|
|
|
|
Preload("FinancialFrom")
|
|
|
|
|
|
|
|
|
|
|
|
if in.Type != "" {
|
|
|
|
if in.Type != "" {
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
@ -682,12 +685,11 @@ func MySubmitApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
Preload("Work.ApprovalWorks").
|
|
|
|
Preload("Work.ApprovalWorks").
|
|
|
|
Preload("Bundle").
|
|
|
|
Preload("Bundle").
|
|
|
|
Preload("BundlePayPrice").
|
|
|
|
Preload("BundlePayPrice").
|
|
|
|
Preload("ApprovalWorkFlows", func(db *gorm.DB) *gorm.DB {
|
|
|
|
Preload("ApprovalWorkFlows").
|
|
|
|
return db.Order("level asc")
|
|
|
|
|
|
|
|
}).
|
|
|
|
|
|
|
|
Preload("ExhibitionReward.ApprovalExhibitions").
|
|
|
|
Preload("ExhibitionReward.ApprovalExhibitions").
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("Exhibition.ApprovalExhibitions")
|
|
|
|
Preload("Exhibition.ApprovalExhibitions").
|
|
|
|
|
|
|
|
Preload("FinancialFrom")
|
|
|
|
|
|
|
|
|
|
|
|
if in.Status != 0 {
|
|
|
|
if in.Status != 0 {
|
|
|
|
modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
|
|
|
|
modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
|
|
|
@ -719,7 +721,8 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
Preload("ApprovalWorkFlows").
|
|
|
|
Preload("ApprovalWorkFlows").
|
|
|
|
Preload("ExhibitionReward.ApprovalExhibitions").
|
|
|
|
Preload("ExhibitionReward.ApprovalExhibitions").
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
Preload("Exhibition.ApprovalExhibitions")
|
|
|
|
Preload("Exhibition.ApprovalExhibitions").
|
|
|
|
|
|
|
|
Preload("FinancialFrom")
|
|
|
|
|
|
|
|
|
|
|
|
if in.Type != "" {
|
|
|
|
if in.Type != "" {
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
@ -807,6 +810,8 @@ func getApprovalContentFactory(typeFiled string) (ApprovalContentInterface, erro
|
|
|
|
return &BundlePayPrice{}, nil
|
|
|
|
return &BundlePayPrice{}, nil
|
|
|
|
case TypeArtExhibitionReward:
|
|
|
|
case TypeArtExhibitionReward:
|
|
|
|
return &ExhibitionReward{}, nil
|
|
|
|
return &ExhibitionReward{}, nil
|
|
|
|
|
|
|
|
case TypeFinancialForm:
|
|
|
|
|
|
|
|
return &FinancialFrom{}, nil
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
return &Approval{}, nil
|
|
|
|
return &Approval{}, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|