全部审批 修改查询条件

pkg/model/approval.go

@@ -610,9 +610,12 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 	}
 	s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id")
 
+	/*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(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
+		DB.Where(queryApproval). // 我需要审批的
-			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排序
@@ -659,8 +662,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). //完成，我参与审批
+				Where("status != ?", StatusDoing).                                                                       //完成，我参与审批
-				Or(DB.Where("now_user_id", in.UserID).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))) //抄送人(完成抄送)
 	}
 
@@ -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)
+	}
+
 	/**
 	* 审批展示(抄送在此不表)
 			/       \
@@ -722,8 +729,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). //完成，我参与审批
+				Where("status != ?", StatusDoing).                                                                       //完成，我参与审批
-				Or(DB.Where("now_user_id", in.UserID).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))) //抄送人(完成抄送)
 	}