全部审批 修改查询条件

pkg/model/approval.go

@@ -610,8 +610,11 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 	}
 	s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id")
 
-	modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
+	/*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))) // 已完成，抄送给我的	*/
+	modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
+		DB.Where(queryApproval). // 我需要审批的
 						Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的
 	modelObj.Count(&count)
 
@@ -712,6 +715,10 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		modelObj = modelObj.Where(&Approval{SubmitterName: in.SubmitterName})
 	}
 
+	if in.StartTime != "" && in.EndTime != "" {
+		modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime)
+	}
+
 	/**
 	* 审批展示(抄送在此不表)
 			/       \