Объединить в коде фильтр по диапазону дат и значениям других полей

Option Compare Database
Dim MyFilter As String
 
Private Sub Form_Open(Cancel As Integer)
DoCmd.MoveSize 430, 30, 14470, 9050
End Sub
 
Private Function ListEnter(ColumnName As Variant)
Dim strSQL As String
Dim ctlCurrentControl As Control
Set ctlCurrentControl = Screen.ActiveControl
With ctlCurrentControl
 
If Me.FilterOn And Me.Filter <> "" Then
strSQL = "SELECT " & ColumnName & " FROM ( " & Me.RecordSource & ") WHERE " & Me.Filter & " GROUP BY " & ColumnName & " ORDER BY " & ColumnName & ""
 
.RowSource = strSQL
 
Else
.RowSource = "SELECT " & ColumnName & " FROM ( " & Me.RecordSource & ") GROUP BY " & ColumnName & " ORDER BY " & ColumnName & ""
End If
End With
End Function
Private Function ListAfterUpdate(ColumnName As Variant)
Dim ctlCurrentControl As Control
Set ctlCurrentControl = Screen.ActiveControl
If Me.FilterOn And Me.Filter <> "" Then
    If IsNull(ctlCurrentControl) Or ctlCurrentControl.Value = "" Then
       Me.Filter = "" & MyFilter & " AND " & ColumnName & " Is Null"
       Me.FilterOn = True
MyFilter = Me.Filter
    Else
   Me.Filter = "" & MyFilter & " AND " & "" & ColumnName & " LIKE '" & ctlCurrentControl & "'"
    MyFilter = Me.Filter
    Me.FilterOn = True
    End If
Else
    If IsNull(ctlCurrentControl) Or ctlCurrentControl.Value = "" Then
       Me.Filter = "" & ColumnName & " Is Null"
       Me.FilterOn = True
       MyFilter = Me.Filter
    Else
        Me.Filter = "" & ColumnName & " LIKE '" & ctlCurrentControl & "'"
        MyFilter = Me.Filter
        Me.FilterOn = True
    End If
End If
End Function
 
 
Private Sub Кнопка22_Click()
On Error GoTo Err_Кнопка22_Click
 
 
    DoCmd.Close
 
Exit_Кнопка22_Click:
    Exit Sub
 
Err_Кнопка22_Click:
    MsgBox Err.Description
    Resume Exit_Кнопка22_Click
    
End Sub
 
Private Sub ЗаголовокФормы_Click()
 
End Sub
 
 
Private Sub выборИнженер_AfterUpdate()
Call ListAfterUpdate("[ИнженерПоДиагностике]")
End Sub
 
 
Private Sub выборИнженер_Enter()
Call ListEnter("[ИнженерПоДиагностике]")
End Sub
 
Private Sub выборМенеджер_AfterUpdate()
Call ListAfterUpdate("[ВедущийМенеджер]")
End Sub
 
Private Sub выборМенеджер_Enter()
Call ListEnter("[ВедущийМенеджер]")
End Sub
 
 
Private Sub cmdClearFilter_Click()
On Error GoTo Err_cmdClearFilter_Click
 
    Me.выборИнженер.Value = ""
    Me.выборМенеджер.Value = ""
    MyFilter = ""
    Me.FilterOn = False
 
Exit_cmdClearFilter_Click:
    Exit Sub
 
Err_cmdClearFilter_Click:
    MsgBox Err.Description
    Resume Exit_cmdClearFilter_Click
    
End Sub
 
Private Sub От_AfterUpdate()
Me.Filter = "УПД_дата Between " & Format(Nz(Me.От, #1/1/1000#), "\#mm\/dd\/yyyy\#") & " And " & Format(Nz(Me.До, #1/1/3000#), "\#mm\/dd\/yyyy\#")
Me.FilterOn = True
End Sub
 
Private Sub До_AfterUpdate()
Me.Filter = "УПД_дата Between " & Format(Nz(Me.От, #1/1/1000#), "\#mm\/dd\/yyyy\#") & " And " & Format(Nz(Me.До, #1/1/3000#), "\#mm\/dd\/yyyy\#")
Me.FilterOn = True
End Sub

Private Sub Кнопка1108_Click()
DoCmd.OpenReport "№ ЛИСТ РАССЧЁТА ЗП", acViewReport
End Sub

Private Sub Кнопка1108_Click()
Dim sWhereCondition As String
' если фильтр формы включен - копируем фильтр из формы
    If Me.FilterOn Then sWhereCondition = Me.Filter
    DoCmd.OpenReport "№ ЛИСТ РАССЧЁТА ЗП", acViewReport, , sWhereCondition
End Sub