add format dateTest and refactoring code
Merge branch 'report'