Merge branch 'jhc'

pkg/model/approval.go

@@ -706,6 +706,36 @@ func MySubmitApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 	return list, count
 }
 
+func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
+	var list []*Approval
+	var count int64
+
+	//list
+	modelObj := DB.Model(&Approval{}).
+		Preload("Show").
+		Preload("Work.ApprovalWorks").
+		Preload("Bundle").
+		Preload("BundlePayPrice").
+		Preload("ApprovalWorkFlows").
+		Preload("ExhibitionReward.ApprovalExhibitions").
+		Preload("ApprovalType.ApprovalTypeGroup").
+		Preload("Exhibition.ApprovalExhibitions")
+
+	if in.Type != "" {
+		modelObj = modelObj.Where(&Approval{Type: in.Type})
+	}
+
+	//modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
+
+	modelObj.Where(" status = 2  and  json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
+
+	modelObj.Count(&count)
+
+	modelObj.Limit(int(in.PageSize)).Offset(page.GetOffset(in.Page, in.PageSize)).Order("id desc").Find(&list)
+
+	return list, count
+}
+
 func (m *Approval) Pass(reply string, workFlowId uint64) error {
 	return m.operateStatus(StatusOk, reply, workFlowId)
 }

pkg/service/approval.go

@@ -265,6 +265,8 @@ func (a *ApprovalProvider) MyWork(ctx context.Context, in *approval.ListRequest)
 
 	if in.Status == 0 && in.ApprovedBossId == 0 {
 		list, count = model.MyAllWorkApprovals(in)
+	} else if in.Status == 4 && in.ApprovedBossId == 0 {
+		list, count = model.MyReadApprovals(in)
 	} else {
 		list, count = model.MyWorkApprovals(in)
 	}