After you file

Yes, the over contribution needs to be reported on your 2018 Tax Return regardless of whether you are able to withdraw it.  If it is not withdrawn by 4/15, you don't need to report anything on your 2019 Tax Return.