finishing my current master's and getting enrolled into a new institution

Hello,
I've got confused about the situation. Please, help to realize what to do
I am graduating from my master's program this June -July and my residence permit is valid till July 31, 2020.
I also got enrolled in another school. They first told me they can help to extend my residence permit, but once they realized it's valid only until July 31, they said I will need to get a new Visa.

Getting a new visa means I need to go back to the country I came from and apply for a new visa and stuff.
But since the covid-19 just erupted in that country, I believe, there will be no flights to and from, and the visa procedure will be complicated than before, and it may take much longer to come back.
Is there any way I could extend my residence permit without leaving China?

Maybe the 2 months extension that was granted to foreigners during the outbreak period is applicable to my situation? Or I can ask my current school to somehow help me with an extension until I get enrolled in the new school?

Thank you